Merge branches 'feature/20220105_无单收银支持储值卡_wuping' and 'qa' of…

Merge branches 'feature/20220105_无单收银支持储值卡_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java

@@ -98,7 +98,7 @@ public class CreateOrderAdapter {
             requestDto.setUnionPayCard(u);
         }
         // 转换 fisherman end
-        requestDto.setStoreId(createOrderBo.getCreateOrderBaseVo().getShopId());
+//        requestDto.setStoreId(createOrderBo.getCreateOrderBaseVo().getShopId());
         requestDto.setChannel(createOrderBo.getCreateOrderBaseVo().getChannel());
         return requestDto;
     }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3361,7 +3361,7 @@ public class OrderAdapter {
         requestDto.setTransId(createOrderOperateDto.getFatherOrderBean().getOid());
         requestDto.setOrderClient(null);
         requestDto.setUnionPayCard(createOrderVo.getUnionPayCard());
-        requestDto.setStoreId(createOrderVo.getShopId());
+//        requestDto.setStoreId(createOrderVo.getShopId());
         requestDto.setChannel(createOrderVo.getChannel() == null ? "" : createOrderVo.getChannel());
         return requestDto;
     }

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -173,7 +173,7 @@ public class SpellGroupOrderAdapter {
         requestDto.setOrderClient(OrderClientType.getOrderClientType(Integer.valueOf(data.getOrderClient())));
         requestDto.setProductOrderBean(data);
         requestDto.setFatherOrderBean(data);
-        requestDto.setStoreId(data.getShopId());
+//        requestDto.setStoreId(data.getShopId());
         requestDto.setChannel("");
         return requestDto;
     }

order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java

@@ -68,7 +68,12 @@ public class CreatePrepayRequestDto {
      * 使用电子风味卡
      */
     private CreateOrderUnionPayCardVo unionPayCard;
-    private String storeId;
+    /**
+     * 支付门店　混合支付当时定义（暂时废弃，取订单门店）,
+     * 虚拟商品（券包）分账可使用　可优化
+     */
+    private String payStoreId;
+
     private String channel;
 
     private String sessionId;

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

@@ -161,7 +161,7 @@ public class PayServiceImpl {
         CreateOrderResponseVo createOrderResponse;
         OrderPayResponse orderPayResponse = null;
         PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(),
-                createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode(), createPrepayRequestDto.getFatherOrderBean().getShopId());
+                createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
         long totalAmount = createPrepayRequestDto.getTotalAmount();
         String cardCode = createPrepayRequestDto.getCardCode();
         String transId = createPrepayRequestDto.getTransId();
@@ -179,7 +179,7 @@ public class PayServiceImpl {
             orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, createPrepayRequestDto.getCardAmount(), transId, createPrepayRequestDto.getOrderExtInfoDTO());
         } else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
             //混合支付+svc卡(礼品卡)
-            orderPayResponse = switchSvcOrComb(totalAmount, cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, createPrepayRequestDto.getChannel(), createPrepayRequestDto.getStoreId(), LogThreadLocal.getTrackingNo());
+            orderPayResponse = switchSvcOrComb(totalAmount, cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, createPrepayRequestDto.getChannel());
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());
@@ -431,7 +431,7 @@ public class PayServiceImpl {
     /**
      * 查询支付配置
      */
-    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode, String storeId) {
+    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode) {
         //设置支付信息
         PaymentRequest paymentRequest = new PaymentRequest();
         paymentRequest.setOpenId(openId);
@@ -649,9 +649,7 @@ public class PayServiceImpl {
             , OrderBeanV1 orderBean
             , PaymentRequest paymentRequest
             , String transId
-            , String channel
-            , String storeId
-            , String trackingNo) {
+            , String channel) {
 
         OrderPayResponse orderPayResponse = null;
         //混合支付开关
@@ -659,7 +657,7 @@ public class PayServiceImpl {
         //混合支付
         if (check && StringUtils.isNotBlank(channel)) {
             String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
-            orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId);
+            orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, orderBean.getShopId());
         } else {//svc 支付
             orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId);
         }

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

@@ -440,7 +440,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         createPrepayRequestDto.setTotalAmount(createOrderRequest.getSettlementAmount());
         createPrepayRequestDto.setCardAmount(0);
         createPrepayRequestDto.setChannel(requestVo.getChannel());
-        createPrepayRequestDto.setStoreId(storeId);
+//        createPrepayRequestDto.setStoreId(storeId);
         OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
         String deliveryHoursDayStart = "";
         String deliveryHoursDayEnd = "";

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -679,7 +679,7 @@ public abstract class UniversalOrderService {
         }
         //混合支付+svc卡
         else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
-            orderPayResponse = payService.switchSvcOrComb(totalAmount, cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, createPrepayRequestDto.getChannel(), createPrepayRequestDto.getStoreId(), LogThreadLocal.getTrackingNo());
+            orderPayResponse = payService.switchSvcOrComb(totalAmount, cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, createPrepayRequestDto.getChannel());
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());