Merge branch 'KA-蜜雪订单C端支付展示-ID035981-20210826-zxh' into pre

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

@@ -121,6 +121,11 @@ public class OrderCommonService {
         paymentRequest.setWxAppId(wxAppId);
         AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId);
         paymentRequest.setPrincipalName(wxApp.getPrincipalName());
+        // fisherman 2227 测试商户号, 下个版本需要删除
+        if ("2080".equals(partnerId) || "2227".equals(partnerId)) {
+            //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
+            paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店");
+        }
         paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
         //修改订单信息
         OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);

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

@@ -2620,7 +2620,7 @@ public class OrderServiceImpl implements Orderservice {
 
         CreateOrderResponseVo createOrderResponse;
         OrderPayResponse orderPayResponse = null;
-        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
+        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode(), createPrepayRequestDto.getFatherOrderBean().getShopId());
         long totalAmount = createPrepayRequestDto.getTotalAmount();
         String cardCode = createPrepayRequestDto.getCardCode();
         String transId = createPrepayRequestDto.getTransId();
@@ -2947,6 +2947,17 @@ public class OrderServiceImpl implements Orderservice {
         return paymentRequest;
     }
 
+    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode,String storeId) {
+        PaymentRequest paymentRequest = this.orderBodyConvertToPaymentBody(openId, partnerId, appId, payCode);
+        // fisherman 2227 测试商户号, 下个版本需要删除
+        boolean isTrue = "2080".equals(partnerId) || "2227".equals(partnerId);
+        if (isTrue) {
+            //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
+            paymentRequest.setPrincipalName("蜜雪冰城"+ storeId +"店");
+        }
+        return paymentRequest;
+    }
+
     public OrderExtInfoDto getExtInfo(AssortmentCustomerInfoVo userLoginInfoDto, StoreResponse.BizVO storeResponseDto,
                                       Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto) {
 
@@ -3370,7 +3381,7 @@ public class OrderServiceImpl implements Orderservice {
         //<!---创建订单公共方法执行逻辑--->
         OrderPayResponse orderPayResponse = null;
         String appId = userLoginInfoDto.getWxAppId();
-        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(), appId, null);
+        PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(), appId, null,fatherBeanListOne.getShopId());
         //支付金额异常
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);