Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -164,7 +164,7 @@ public interface FsCourseRedPacketLogMapper
             "WHERE create_time <= DATE_SUB(NOW(), INTERVAL 10 MINUTE)  -- 10 分钟前或更早\n" +
             "AND create_time >= DATE(NOW())  -- 但必须是今天\n" +
             "AND status = 0;")
-    List<FsCourseRedPacketLog> selectFail();
+    List<FsCourseRedPacketLog> selectFailAll();
 
     @Select("SELECT * FROM fs_course_red_packet_log WHERE status = 0 and create_time > DATE_SUB(NOW(), INTERVAL 2 day) and company_user_id =#{userId}")
     List<FsCourseRedPacketLog> selectFail(@Param("userId") Long userId);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -701,7 +701,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
     public void bufaRedPacket() {
 //        String json = configService.selectConfigByKey("redPacket.config");
 //        RedPacketConfig config = JSONUtil.toBean(json, RedPacketConfig.class);
-        List<FsCourseRedPacketLog> logs = redPacketLogMapper.selectFail();
+        List<FsCourseRedPacketLog> logs = redPacketLogMapper.selectFailAll();
         String appId = "wx414427b10866c04e";
         for (FsCourseRedPacketLog log : logs){
             FsUserScrm user = userService.selectFsUserById(log.getUserId());