Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java

@@ -18,6 +18,8 @@ public interface FinTempTimePushFeign {
     @PostMapping("/save")
     public ResultBean save(@RequestBody FinTempTimePushDto dto);
 
-
+    @ApiOperation("测试推送凭证")
+    @PostMapping("/test")
+    public void test();
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java

@@ -37,4 +37,7 @@ public interface FinTempTimePushMapper extends BaseMapper<FinTempTimePush> {
 
 
     List<FinTempTimePush> selListByBusType(@Param("busType") String busType);
+
+
+    void delBySid(@Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushMapper">
+    <delete id="delBySid">
+        DELETE FROM fin_temp_time_push
+        WHERE sid =#{sid}
+    </delete>
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java

@@ -41,8 +41,16 @@ public class FinTempTimePushRest implements FinTempTimePushFeign {
 
     @Autowired
     private FinTempTimePushService finTempTimePushService;
+
+    @Autowired
+    private TimingPushService timingPushService;
     @Override
     public ResultBean save(FinTempTimePushDto dto) {
         return finTempTimePushService.saveEntity(dto);
     }
+
+    @Override
+    public void test() {
+        timingPushService.monthlyAccrualVoucher();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java

@@ -49,4 +49,8 @@ public class FinTempTimePushService extends MybatisBaseService<FinTempTimePushMa
     public List<FinTempTimePush> selListByBusType(String busType) {
         return baseMapper.selListByBusType(busType);
     }
+
+    public void delBySid(String sid) {
+        baseMapper.delBySid(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java

@@ -25,17 +25,16 @@ public class TimingPushService {
     /**
      * 定时推送月还计提凭证
      */
-//    @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ?") //每月2-10号 3点推送
-    @Scheduled(cron = "0 0/3 * * * ?") //每月2-10号 3点推送
+    @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ?") //每月2-10号 3点推送
+//    @Scheduled(cron = "0 0/3 * * * ?") //每3分钟推送
     public void monthlyAccrualVoucher() {
       List<FinTempTimePush> list = finTempTimePushService.selListByBusType("月还计提");
       list.removeAll(Collections.singleton(null));
       if (!list.isEmpty()) {
           for (FinTempTimePush f : list) {
               loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
-              finTempTimePushService.deleteBySid(f.getSid());
+              finTempTimePushService.delBySid(f.getSid());
           }
       }
-
     }
 }