Merge branches 'ka-券包资金分账-20211020-jxy' and 'qa' of…

Merge branches 'ka-券包资金分账-20211020-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -343,7 +343,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         if ((wxAppStore == null || wxAppStore.getClientCode() == null)) {
             return ResponseUtil.error(ResponseCodeConstant.RESPONSE_ERROR_STR, "支付门店未配置");
         }
-        createOrderRequest.setStoreId(wxAppStore.getStoreId());
+        //唤起支付的门店需要根据虚拟商品的是否分账配置确定，如果不分账，还是用前端传的门店去唤起支付
+        createOrderRequest.setStoreId(createOrderRequest.getIsSplitAccount() != null && createOrderRequest.getIsSplitAccount() == 1 ? wxAppStore.getStoreId() : storeId);
         OrderBaseResp<OrderInfoReqs> orderInfoReqsBaseResponse = orderSdkService.createOrder(createOrderRequest, trackingNo);
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(orderInfoReqsBaseResponse);
         if (createOrderResponse == null || createOrderResponse.getErrcode() != 100) {
@@ -800,6 +801,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                     productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
                     //新增是否分账，核销次数和券单价
                     productBindingCouponType2.setIsSplitAccount(productBindingCouponType.getIsSplitAccount());
+                    //分账的券包对应所有券都是一致，要么分账，要么不分账，循环赋值都是相同的
+                    request.setIsSplitAccount(productBindingCouponType.getIsSplitAccount());
                     productBindingCouponType2.setMaxRedeemTimes(productBindingCouponType.getMaxRedeemTimes());
                     productBindingCouponType2.setPrice(productBindingCouponType.getPrice());
                     productBindingCoupons.add(productBindingCouponType2);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -244,6 +244,9 @@ public class CreateOrderRequest extends BaseRequest {
      */
     private List<ChooseGood> orderSendCouponRespList;
 
+    //卖券订单，是否开启分账（0不开启，1开启）
+    private Integer isSplitAccount;
+
     @Data
     public static class ChooseGood {