红包退回 修改

fs-company/src/main/java/com/fs/company/controller/common/CommonController.java

@@ -106,15 +106,16 @@ public class CommonController
         // 默认是前两天时间
         String createSTime;
         String createETime;
-        if (StringUtils.isNotBlank(time)) {
-            Date date = DateUtils.parseDate(time);
-            createSTime = time+" 00:00:00";
-            createETime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(date, 1))+" 00:00:00";
-        } else {
-            createSTime = DateUtils.parseDateToStr( DateUtils.YYYY_MM_DD,DateUtils.addDays(new Date(), -2))+" 00:00:00";
-            createETime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(new Date(), -1))+" 00:00:00";
-        }
-
+//        if (StringUtils.isNotBlank(time)) {
+//            Date date = DateUtils.parseDate(time);
+//            createSTime = time+" 00:00:00";
+//            createETime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(date, 1))+" 00:00:00";
+//        } else {
+//            createSTime = DateUtils.parseDateToStr( DateUtils.YYYY_MM_DD,DateUtils.addDays(new Date(), -2))+" 00:00:00";
+//            createETime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,DateUtils.addDays(new Date(), -1))+" 00:00:00";
+//        }
+        createSTime=time;
+        createETime=time;
         // 这个地方真加的是company money字段 xgb
         companyService.rollbackRedPacketMoney(createSTime, createETime);
         return R.ok();

fs-company/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -133,6 +133,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/qw/data/**").anonymous()
                 .antMatchers("/qw/user/selectCloudByCompany").anonymous()
                 .antMatchers("/live/LiveMixLiuTestOpen/**").anonymous()
+//                .antMatchers("/common/test2").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -1840,7 +1840,7 @@ public class CompanyServiceImpl implements ICompanyService
 
             if(!StringUtils.isEmpty(redLogs.getBatchId())){
                 R result=checkMchTransferStatusByBatchID(redLogs.getBatchId(),redLogs.getCompanyId());
-                if("200".equals(result.get("code"))){
+                if("200".equals(String.valueOf(result.get("code")))){
                     FsCourseRedPacketLog update = new FsCourseRedPacketLog();
                     update.setUpdateTime(new Date());
                     update.setLogId(redLogs.getLogId());
@@ -1858,8 +1858,8 @@ public class CompanyServiceImpl implements ICompanyService
                         return;
                     }else if("fail".equals(result.get("status"))){// 只对失败的部分进行回滚
                         // 更新支付状态
-                        update.setStatus(2); // 已退回
-                        fsCourseRedPacketLogMapper.updateFsCourseRedPacketLog(update);
+//                        update.setStatus(2); // 已退回
+//                        fsCourseRedPacketLogMapper.updateFsCourseRedPacketLog(update);
 
                         redBalanceLogs.setStatus(2L);
                         companyRedPacketBalanceLogsMapper.updateCompanyRedPacketBalanceLogsByRedPacketId(redBalanceLogs);