商户佣金费用收益每月统计任务

device-api-service/src/main/java/com/xy/job/MercFeeCountDayJob.java

@@ -97,7 +97,7 @@ public class MercFeeCountDayJob {
                 throw new CommRuntimeException("已存在日期【" + date + "】的数据，请勿重复执行！");
             }
         }
-        String monthValue = StrUtil.sub(queryDay, 0, 5);
+        String monthValue = StrUtil.sub(queryDay, 0, 6);
         Integer dateValue = Integer.valueOf(queryDay);
         LocalDate dayDate = LocalDate.parse(queryDay, DateTimeFormatter.BASIC_ISO_DATE);
         LocalDateTime dayTime = dayDate.atStartOfDay();

device-api-service/src/main/java/com/xy/job/MercFeeCountMonthJob.java

@@ -58,12 +58,12 @@ public class MercFeeCountMonthJob {
     public ReturnT<String> monthJob(String date) {
         //获取上个月
         DateTime lastMonth = DateUtil.lastMonth();
-        String queryDay = DateUtil.format(lastMonth, DatePattern.PURE_DATE_PATTERN);
+        String queryDay = DateUtil.format(lastMonth, DatePattern.SIMPLE_MONTH_PATTERN);
         if (StrUtil.isNotEmpty(date)) {
             queryDay = date;
             //指定日期需要判断是否重复执行
             MercFeeCountMonthDto.SelectList selectList = new MercFeeCountMonthDto.SelectList();
-            selectList.setDateValue(Integer.valueOf(queryDay));
+            selectList.setDateValue(Integer.valueOf(DateUtil.format(lastMonth, DatePattern.PURE_DATE_PATTERN)));
             List<MercFeeCountMonthDto.Vo> vos = R.feignCheckData(mercFeeCountMonthService.list(selectList));
             if (CollUtil.isNotEmpty(vos)) {
                 throw new CommRuntimeException("已存在日期【" + date + "】的数据，请勿重复执行！");

device-api-service/src/main/java/com/xy/mapper/mapper/MercFeeCountDayMapper.xml

@@ -21,7 +21,7 @@
                SUM(pay_money) AS pay_money,
                SUM(brokerage) AS brokerage
         FROM merc_fee_count_day
-        WHERE month_value = #{monthValue}
+        WHERE month_value = #{query.monthValue}
         GROUP BY parent_merc_id,
                  merc_id,
                  fee_type