Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of…

Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

order-application-service/src/main/java/cn/freemud/entities/vo/order/PaymentConfigVo.java

@@ -17,7 +17,7 @@ public class PaymentConfigVo {
     private String partnerId;
 
     @ApiModelProperty("门店号")
-    private String storeId;
+    private String shopId;
 
     /**
      * 插件类型 1=爱心餐　2= 周周惠

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

@@ -391,7 +391,7 @@ public class OrderAdapterServiceImpl {
         }
         //周周惠插件要返回参数
         if(paymentConfigVo.getPlugInType() != null && paymentConfigVo.getPlugInType() == 2){
-            return ResponseUtil.success(payService.getPlugInParameter(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId(),paymentConfigVo.getStoreId()));
+            return ResponseUtil.success(payService.getPlugInParameter(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId(),paymentConfigVo.getShopId()));
         }
 
         //1元插件要返回参数