From 5e2015737324bd5de21a57d82b3fd17510ec957a Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 12 Sep 2019 11:43:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=94=9F=E6=97=A5=EF=BC=8C=E4=B8=80=E4=B8=AAmall=E5=8F=91?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/schedule/CouponSendSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index be84aff14..d601eac73 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -303,7 +303,7 @@ public class CouponSendSchedule { } }).collect(Collectors.toList()); - List couponSendedUsers = new ArrayList<>(); + Set couponSendedUsers = new HashSet<>(); for (WxCouponSendVo cs : couponSendList) { if (cs.getRemainInventory() <= 0) { logger.info("生日发券: [title={},id={}]卡券库存不足!", cs.getTitle(), cs.getCouponId()); From ba20c2d2de5b576684a62585a3eb5b581c913091 Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 12 Sep 2019 11:46:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=94=9F=E6=97=A5=EF=BC=8C=E6=B5=8B=E8=AF=95=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/schedule/CouponSendSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index d601eac73..05c4ee3c4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -211,7 +211,7 @@ public class CouponSendSchedule { /** * 生日券发放 */ - @Scheduled(cron = "0 30 8 * * ?") // 测试每天8:30点发券 + @Scheduled(cron = "0 30 14 * * ?") // 测试每天8:30点发券 public void birthdayCouponSendSchedule() { logger.info("生日发券: 任务开始"); List mallList = wxMallMapper.findList(new WxMall()); From 41bfd8ba4924a962b458fb42718ad24f6ccbbe12 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 11:58:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxBillSettleBill.java | 5 +++ .../mapper/WxBillSettleBillMapper.xml | 37 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java index 75b7469a6..8cc76487d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -50,4 +50,9 @@ public class WxBillSettleBill extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") private Date endtime; + + + @Transient + @io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe") + private Integer getReceivePayOrOwe; } diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index 8c084e9a8..dc34c0ed3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -46,12 +46,23 @@