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..dca67ea13
--- /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);
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);
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}