Merge remote-tracking branch 'origin/master'

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

@@ -54,11 +54,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
-import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
+import com.freemud.api.assortment.datamanager.manager.*;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappAuthorizerManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
@@ -218,6 +215,8 @@ public class OrderServiceImpl implements Orderservice {
     private CacheOpenPlatformPartnerWxappConfigManager cacheOpenPlatformPartnerWxappConfigManager;
     @Autowired
     private OrderAdapterService orderAdapterService;
+    @Autowired
+    private AssortmentOpenPlatformPartnerManager assortmentOpenPlatformPartnerManager;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -1872,17 +1871,17 @@ public class OrderServiceImpl implements Orderservice {
         return orderPayResponse;
     }
 
-    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId, String payCode) {
+    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode) {
         //设置支付信息
         PaymentRequest paymentRequest = new PaymentRequest();
         paymentRequest.setOpenId(openId);
         paymentRequest.setWxAppId(appId);
         AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, appId);
-        String principalName = "上海非码网络科技有限公司";
-        if(wxApp != null){
-            principalName = wxApp.getPrincipalName();
+        AssortmentOpenPlatformPartner platformPartner = null;
+        if (wxApp == null) {
+            platformPartner = assortmentOpenPlatformPartnerManager.selectOpenPlatformPartner(partnerId);
         }
-        paymentRequest.setPrincipalName(principalName);
+        paymentRequest.setPrincipalName(wxApp != null ? wxApp.getPrincipalName() : platformPartner != null ? platformPartner.getCompanyName() : "上海非码网络科技有限公司");
         paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
         paymentRequest.setPayCode(payCode);
         return paymentRequest;