发红包从配置里取配置

fs-service-system/src/main/java/com/fs/his/param/WxSendRedPacketParam.java

@@ -10,13 +10,13 @@ public class WxSendRedPacketParam implements Serializable {
 
     private String openId;
 
-    private BigDecimal amount;
+    private BigDecimal amount; //金额
 
-    private Long companyId;
+    private Long companyId; //公司id
 
     private Integer source=1;//来源 1:h5  2:看课小程序
 
-    private Integer redPacketMode;
+    private Integer redPacketMode; //红包模式
 
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStorePaymentServiceImpl.java

@@ -373,9 +373,10 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
                 config = JSONUtil.toBean(json, RedPacketConfig.class);
                 break;
         }
-//        if (param.getSource()==2){
-//            config.setAppId("wxb9b453d37c5fad45");
-//        }
+        //黑坑！！现在是云联融智优选的
+        if (param.getSource()==2){
+            config.setAppId("wxd70f99287830cb51");
+        }
         //组合返回参数
         R result = new R();
         // 根据 isNew 判断使用哪种发红包方式
@@ -385,7 +386,9 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
             result= sendRedPacketLegacyInternal(param, config);
         }
         result.put("isNew",config.getIsNew());
-        result.put("mchId",config.getMchId());
+//        result.put("mchId",config.getMchId());
+        //黑坑！！现在是云联融智优选的
+        result.put("mchId","1708360153");
         System.out.println("发红包返回"+result);
         return result;
     }

fs-user-app/src/main/java/com/fs/app/controller/PaymentController.java

@@ -72,4 +72,7 @@ public class PaymentController extends AppBaseController {
 
     }
 
+
+
+
 }

fs-user-app/src/main/java/com/fs/app/controller/WxPayController.java

@@ -6,6 +6,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.R;
 import com.fs.course.config.RedPacketConfig;
 import com.fs.course.service.IFsCourseRedPacketLogService;
+import com.fs.his.param.WxSendRedPacketParam;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsUser;
 import com.fs.store.enums.*;