From e83466b117a71e6f5909774f0f2811c542dc2fc6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 25 May 2019 10:53:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[BUG][ID1001630][=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=97=A5=E5=B8=B8=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E9=80=BE=E6=9C=9F=E5=A4=A9=E6=95=B0=EF=BC=8C=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=A4=A7=E4=BA=8E=E5=AE=9E=E9=99=85=E7=BC=B4?= =?UTF-8?q?=E7=BA=B3=E6=97=B6=E9=97=B4=E9=80=BE=E6=9C=9F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillDailyServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index b7e00530c..2741032c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -259,9 +259,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setPayDate(date); } int expiredDay = DateUtils.daysBetween(receiveDate, date); - wxBillDaily.setExpiredDay((long) expiredDay); + wxBillDaily.setExpiredDay(billDaily.getExpiredDay()); if (expiredDay > 0) { wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + if (billDaily.getExpiredDay().equals(0L)) { + wxBillDaily.setExpiredDay((long) expiredDay); + } } else { wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } @@ -272,6 +275,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setUserId(user.getId()); wxBillDaily.setShopId(billDaily.getShopId()); wxBillDaily.setRentShopType(billDaily.getRentShopType()); + wxBillDaily.setPayWay(EnumBillPayWay.OTHER.getCode()); wxBillDaily.setCreatetime(date); wxBillDaily.setUpdatetime(date); From 787c333bcab55daf7d434c2a80031c3ce30c4d0a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 25 May 2019 11:15:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql new file mode 100644 index 000000000..bcd3725b0 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql @@ -0,0 +1,2 @@ +ALTER TABLE `mall_user_info` +ADD INDEX `index_name` (`name` ASC) VISIBLE; From 9bf4904976c85f74ac44ce647baa47d1d140b1c4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 25 May 2019 11:21:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 4c01c9935..d5b152542 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -69,7 +69,7 @@ and `is_admin` = #{isAdmin} - + and `phone` = #{phone} From e90cf9a01c1639f9c784a183fca8d6837d44d0da Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 25 May 2019 11:37:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql index bcd3725b0..dca67ea13 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql @@ -1,2 +1,2 @@ ALTER TABLE `mall_user_info` -ADD INDEX `index_name` (`name` ASC) VISIBLE; +ADD INDEX `index_name` (`name` ASC);