蜜雪->支付信息详情变动 新增2227商户用于测试

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -3184,10 +3184,6 @@ public class OrderAdapter {
         UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
         orderPayDto.setPartnerId(orderBean.getCompanyId());
         orderPayDto.setBody(paymentRequest.getPrincipalName());
-        if ("2080".equals(orderBean.getCompanyId())) {
-            //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
-            orderPayDto.setBody("蜜雪冰城"+orderBean.getShopId());
-        }
         orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
         orderPayDto.setStoreId(orderBean.getShopId());
         orderPayDto.setTransId(transId);

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());
+        // 2227 测试商户号, 下个版本需要删除
+        if ("2080".equals(orderBean.getCompanyId()) || "2227".equals(orderBean.getCompanyId())) {
+            //【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);