Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/course/param/FsCourseSendRewardUParam.java

@@ -27,4 +27,5 @@ public class FsCourseSendRewardUParam implements Serializable
     private Integer sendType;
     private Long periodId;
 
+    private String appId;
 }

fs-service-system/src/main/java/com/fs/course/param/FsCourseTrafficLogParam.java

@@ -27,4 +27,9 @@ public class FsCourseTrafficLogParam {
 
     private String startDate;
     private String endDate;
+
+    /**
+     * tab类型
+     */
+    private String tabType;
 }

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -818,6 +818,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         packetParam.setSource(param.getSource());
         packetParam.setRedPacketMode(config.getRedPacketMode());
         packetParam.setCompanyId(param.getCompanyId());
+        packetParam.setAppId(param.getAppId());
 
         //2025.7.11 红包金额为0的时候
         if (amount.compareTo(BigDecimal.ZERO)>0){

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

@@ -16,7 +16,9 @@ public class WxSendRedPacketParam implements Serializable {
 
     private Integer source=1;//来源 1:h5  2:看课小程序
 
-    private Integer redPacketMode; //红包模式
+    private Integer redPacketMode;//红包模式
+
+    private String appId;
 
 
 }

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

@@ -377,7 +377,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
         }
         //H5的用公众号的appid发，小程序的用小程序的appid来发
         if (param.getSource()==2){
-            config.setAppId(config.getMiniappId());
+            config.setAppId(param.getAppId());
         }
         //组合返回参数
         R result = new R();

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -76,6 +76,11 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
+      - appid: wx414427b10866c04e   #凯逸轩服装店C
+        secret: 4a56cc02f53859e1e9582c15d840c4af
+        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
 
   pay:
     appId: wx11a2ce7c2bbc4521 #微信公众号或者小程序等的appid

fs-service-system/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -74,7 +74,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and project = ${project}
             </if>
         </where>
-        group by company_id,`month`,project,course_id
+
+        <if test="tabType==null or tabType==''">
+            group by company_id,`month`,course_id,project
+        </if>
+        <if test="tabType!=null and tabType=='project'">
+            group by project,`month`
+        </if>
+        <if test="tabType!=null and tabType=='course'">
+            group by course_id,`month`
+        </if>
+        <if test="tabType!=null and tabType=='company'">
+            group by company_id,`month`
+        </if>
+
     </select>
     <select id="getTodayTrafficLog" resultType="java.lang.Long">
         SELECT

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

@@ -76,7 +76,7 @@ public class WxCompanyUserController extends AppBaseController {
 //            return R.error("昵称不符合标准!");
 //        }
         //获取第二个小程序配置，序号从0开始
-        final WxMaService wxService = WxMaConfiguration.getMaService(maProperties.getConfigs().get(1).getAppid());
+        final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info(session.getSessionKey());

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

@@ -112,8 +112,7 @@ public class WxPayController {
     }
 
     @PostMapping( "/test")
-    public R test() throws Exception {
-        WxSendRedPacketParam param  = new WxSendRedPacketParam();
+    public R test(@RequestBody WxSendRedPacketParam param) throws Exception {
         storePaymentService.sendRedPacketTest(param);
         return R.ok();
     }

fs-user-app/src/main/java/com/fs/app/param/LoginMaWxParam.java

@@ -55,4 +55,6 @@ public class LoginMaWxParam implements Serializable {
     @ApiModelProperty(value = "小程序授权类型")
     private Integer authType;
 
+    private String appId;
+
 }