|
@@ -159,7 +159,7 @@ public class YqPayController extends BaseController {
|
|
|
order.setStatus(1); //订单状态
|
|
|
|
|
|
//获取分佣账户
|
|
|
- Integer branchId = 1001;//order.getBranchId();
|
|
|
+ Integer branchId = 1001;//默认分佣账
|
|
|
Account routingAccount = accountService.getRoutingAccount(branchId, amount);
|
|
|
|
|
|
order.setAccount(routingAccount.getSellerNo());
|
|
@@ -277,9 +277,9 @@ public class YqPayController extends BaseController {
|
|
|
|
|
|
//1.关闭订单
|
|
|
HashMap<String, Object> upMap = new HashMap<>();
|
|
|
- upMap.put("status",0);
|
|
|
- upMap.put("oldStatus",1);
|
|
|
- upMap.put("id",userOrder.getId());
|
|
|
+ upMap.put("status", 0);
|
|
|
+ upMap.put("oldStatus", 1);
|
|
|
+ upMap.put("id", userOrder.getId());
|
|
|
orderService.updateByIdAndStatus(upMap);
|
|
|
//2、插入订单
|
|
|
orderService.insert(order);
|
|
@@ -348,7 +348,7 @@ public class YqPayController extends BaseController {
|
|
|
|
|
|
String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
|
|
|
//获取分佣账户
|
|
|
- Integer branchId = 1001;//order.getBranchId();
|
|
|
+ Integer branchId = 1001;//默认分佣账户;
|
|
|
Account routingAccount = accountService.getRoutingAccount(branchId, amount);
|
|
|
|
|
|
Order order = renewalsService.addRenewalsOrder(renewals, amount, orderNo, pickCourses, routingAccount, remark);
|