|
@@ -127,8 +127,6 @@ public class YqPayController extends BaseController {
|
|
order.setType(1);
|
|
order.setType(1);
|
|
order.setUserName(applyInfo.getName());
|
|
order.setUserName(applyInfo.getName());
|
|
|
|
|
|
- order.setAmount(new BigDecimal("2")); //测试设置金额
|
|
|
|
-
|
|
|
|
|
|
|
|
String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
|
|
String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
|
|
order.setOrderNo(orderNo);
|
|
order.setOrderNo(orderNo);
|
|
@@ -161,7 +159,8 @@ public class YqPayController extends BaseController {
|
|
if (branchId.equals(0)) {
|
|
if (branchId.equals(0)) {
|
|
Map<String, Object> routingList = new HashMap<>();
|
|
Map<String, Object> routingList = new HashMap<>();
|
|
routingList.put("routingMerNo", routingMerNo);//分佣账户
|
|
routingList.put("routingMerNo", routingMerNo);//分佣账户
|
|
- routingList.put("routingFee", order.getAmount()); //分佣金额
|
|
|
|
|
|
+ // routingList.put("routingFee", amount); //分佣金额
|
|
|
|
+ routingList.put("routingFee", new BigDecimal("2")); //分佣金额
|
|
tempRoutingList.add(routingList);
|
|
tempRoutingList.add(routingList);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -183,6 +182,8 @@ public class YqPayController extends BaseController {
|
|
String orderSubject = "培训订单";
|
|
String orderSubject = "培训订单";
|
|
|
|
|
|
|
|
|
|
|
|
+ order.setAmount(new BigDecimal("2")); //测试设置金额
|
|
|
|
+
|
|
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
|
|
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
|
|
resultMap.put("sellerNo", "0021677"); //收款商户号
|
|
resultMap.put("sellerNo", "0021677"); //收款商户号
|
|
resultMap.put("payChannels", payChannels); //支付方式
|
|
resultMap.put("payChannels", payChannels); //支付方式
|