周周惠

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

@@ -16,4 +16,11 @@ public class PaymentConfigVo {
     @NotEmpty(message = "商户号不能为空")
     private String partnerId;
 
+    /**
+     * 插件类型 1=爱心餐　2= 周周惠
+     */
+    @ApiModelProperty("插件类型 1=爱心餐　2= 周周惠")
+    private Integer plugInType;
+
+
 }

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

@@ -5,8 +5,31 @@ import lombok.Data;
 @Data
 public class PlugInParameter {
 
+    /**---------------爱心捐插件参数-----------------*/
+
     private String mchCode;
 
     private String subMchCode;
 
+    /**---------------周周惠插件参数-----------------*/
+    /**
+     * 报名商户号
+     */
+    private String applyMchid;
+
+    /**
+     * 签名商户号
+     */
+    private String signMchid;
+
+    /**
+     * 报名的支付门店id
+     */
+    private String storeId;
+
+    /**
+     * HMAC-SHA256签名
+     */
+    private String sign;
+    /**--------------------------------*/
 }

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

@@ -383,13 +383,18 @@ public class OrderAdapterServiceImpl {
 
 
 
-    public BaseResponse<PlugInParameter> getPaymentConfig(PaymentConfigVo createOrderVo){
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
+    public BaseResponse<PlugInParameter> getPaymentConfig(PaymentConfigVo paymentConfigVo){
+        AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(paymentConfigVo.getSessionId());
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        //周周惠插件要返回参数
+        if(paymentConfigVo.getPlugInType() != null && paymentConfigVo.getPlugInType() == 2){
+            return ResponseUtil.success(payService.getPaymentAuth(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
+        }
+
         //1元插件要返回参数
-        return ResponseUtil.success(payService.getPaymentAuth(createOrderVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
+        return ResponseUtil.success(payService.getPaymentAuth(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
 
     }
 

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

@@ -1275,7 +1275,9 @@ public class PayServiceImpl {
         }
     }
 
-    //1元捐插件需要参数
+    /**
+     * 1元捐插件需要参数
+     */
     public PlugInParameter getPaymentAuth(String partnerId, String appId) {
         PlugInParameter plugInParameter = new PlugInParameter();
         List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentAuths = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId, appId);
@@ -1286,6 +1288,19 @@ public class PayServiceImpl {
         return plugInParameter;
     }
 
+    /**
+     * 周周惠插件需要参数
+     */
+    public PlugInParameter getPaymentAuth2(String partnerId, String appId) {
+        PlugInParameter plugInParameter = new PlugInParameter();
+        List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentAuths = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId, appId);
+        if (CollectionUtils.isNotEmpty(openPlatformPartnerPaymentAuths)) {
+            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchId());
+            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getSubMchid());
+        }
+        return plugInParameter;
+    }
+
 
     /**
      * 退款从sdk 剥离