Merge remote-tracking branch 'origin/master'

fs-common/pom.xml

@@ -51,7 +51,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.5.1</version>
         </dependency>
 
         <!-- 阿里JSON解析器 -->

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,8 +373,9 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
                 config = JSONUtil.toBean(json, RedPacketConfig.class);
                 break;
         }
+        //黑坑！！现在是云联融智优选的
         if (param.getSource()==2){
-            config.setAppId("wxb9b453d37c5fad45");
+            config.setAppId("wxd70f99287830cb51");
         }
         //组合返回参数
         R result = new R();
@@ -385,7 +386,9 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
             result= sendRedPacketLegacyInternal(param, config);
         }
         result.put("isNew",config.getIsNew());
-        result.put("mchId","1716217886");
+//        result.put("mchId",config.getMchId());
+        //黑坑！！现在是云联融智优选的
+        result.put("mchId","1708360153");
         System.out.println("发红包返回"+result);
         return result;
     }

fs-service-system/src/main/resources/mapper/statis/FsStatisEveryDayMapper.xml

@@ -147,7 +147,7 @@
                     ${item}
                 </foreach>
             </if>
-            <if test="periodList != null and periodList.length > 0">
+            <if test="periodList != null and periodList.size() > 0">
                 AND period_id IN
                 <foreach collection="periodList" open="(" close=")" separator="," item="item">
                     ${item}

fs-service-system/src/main/resources/mapper/statis/FsStatisPeriodWatchMapper.xml

@@ -45,7 +45,7 @@
                     ${item}
                 </foreach>
             </if>
-            <if test="periodList != null and periodList.length > 0">
+            <if test="periodList != null and periodList.size() > 0">
                 AND period_id IN
                 <foreach collection="periodList" open="(" close=")" separator="," item="item">
                     ${item}

fs-service-system/src/main/resources/mapper/statis/FsStatisSalerWatchMapper.xml

@@ -39,10 +39,10 @@
                      ${item}
                 </foreach>
             </if>
-            <if test="periodList != null and periodList.length > 0">
+            <if test="periodList != null and periodList.size() > 0">
                 AND period_id IN
                 <foreach collection="periodList" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="startDate != null and endDate != null">

fs-user-app/pom.xml

@@ -113,8 +113,10 @@
             <groupId>com.fs</groupId>
             <artifactId>fs-service-system</artifactId>
         </dependency>
-
-
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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.*;

fs-user-app/src/main/java/com/fs/core/aspectj/DataSourceAspect.java

@@ -0,0 +1,72 @@
+package com.fs.core.aspectj;
+
+import com.fs.common.annotation.DataSource;
+import com.fs.common.utils.StringUtils;
+import com.fs.core.datasource.DynamicDataSourceContextHolder;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.core.annotation.Order;
+import java.util.Objects;
+import org.aspectj.lang.reflect.MethodSignature;
+
+/**
+ * 多数据源处理
+ *
+
+ */
+@Aspect
+@Order(1)
+@Component
+public class DataSourceAspect
+{
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Pointcut("@annotation(com.fs.common.annotation.DataSource)"
+            + "|| @within(com.fs.common.annotation.DataSource)")
+    public void dsPointCut()
+    {
+
+    }
+
+    @Around("dsPointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable
+    {
+        DataSource dataSource = getDataSource(point);
+
+        if (StringUtils.isNotNull(dataSource))
+        {
+            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
+        }
+
+        try
+        {
+            return point.proceed();
+        }
+        finally
+        {
+            // 销毁数据源 在执行方法之后
+            DynamicDataSourceContextHolder.clearDataSourceType();
+        }
+    }
+
+    /**
+     * 获取需要切换的数据源
+     */
+    public DataSource getDataSource(ProceedingJoinPoint point)
+    {
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
+        if (Objects.nonNull(dataSource))
+        {
+            return dataSource;
+        }
+
+        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
+    }
+}

fs-user-app/src/main/java/com/fs/core/config/DataSourceConfig.java

@@ -42,7 +42,7 @@ public class DataSourceConfig {
                                         @Qualifier("masterDataSource") DataSource masterDataSource) {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceType.MASTER, masterDataSource);
-        targetDataSources.put(DataSourceType.SOP.name(), sopDataSource);
+        targetDataSources.put(DataSourceType.SOP, sopDataSource);
         return new DynamicDataSource(masterDataSource, targetDataSources);
     }
 

fs-user-app/src/main/java/com/fs/core/datasource/DynamicDataSourceContextHolder.java

@@ -5,8 +5,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 数据源切换处理
- * 
- 
+ *
+
  */
 public class DynamicDataSourceContextHolder
 {
@@ -23,7 +23,7 @@ public class DynamicDataSourceContextHolder
      */
     public static void setDataSourceType(String dsType)
     {
-        log.info("切换到{}数据源", dsType);
+//        log.info("切换到{}数据源", dsType);
         CONTEXT_HOLDER.set(dsType);
     }