Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2360' into release

develop
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
1ea290ca5d
4 измененных файлов: 7 добавлений и 2 удалений
  1. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -1050,7 +1050,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} }
daily.setReceivePay(receivePay); daily.setReceivePay(receivePay);
daily.setPay(daily.getPay() + pay); daily.setPay(daily.getPay() + pay);
daily.setPay(daily.getPay() + pay);
daily.setOwe(0L); daily.setOwe(0L);
long owe = daily.getReceivePay() - daily.getPay(); long owe = daily.getReceivePay() - daily.getPay();
if (owe > 0) { if (owe > 0) {


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java Просмотреть файл

@@ -268,6 +268,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
for (Map.Entry<Long, List<WxBillProperty>> entry : entries) { for (Map.Entry<Long, List<WxBillProperty>> entry : entries) {
List<WxBillProperty> list = entry.getValue(); List<WxBillProperty> list = entry.getValue();
for (WxBillProperty property : list) { for (WxBillProperty property : list) {
if (property.getDepositStatus() == null) {
property.setDepositStatus(0);
}
String shopNumber = property.getShopNumber(); String shopNumber = property.getShopNumber();
if (StringUtils.isEmpty(shopNumber)) { if (StringUtils.isEmpty(shopNumber)) {
String shopInfo = property.getShopInfo(); String shopInfo = property.getShopInfo();


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Просмотреть файл

@@ -317,6 +317,9 @@ public class WxBillRentServiceImpl implements WxBillRentService {
for (Map.Entry<Long, List<WxBillRent>> entry : entries) { for (Map.Entry<Long, List<WxBillRent>> entry : entries) {
List<WxBillRent> list = entry.getValue(); List<WxBillRent> list = entry.getValue();
for (WxBillRent rent : list) { for (WxBillRent rent : list) {
if (rent.getDepositStatus() == null) {
rent.setDepositStatus(0);
}
String shopNumber = rent.getShopNumber(); String shopNumber = rent.getShopNumber();
if (StringUtils.isEmpty(shopNumber)) { if (StringUtils.isEmpty(shopNumber)) {
String shopInfo = rent.getShopInfo(); String shopInfo = rent.getShopInfo();


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -46,7 +46,7 @@
bill.receive_pay receivePay,bill.pay, bill.receive_pay receivePay,bill.pay,
case when bill.status=1 then bill.owe else 0 end owe case when bill.status=1 then bill.owe else 0 end owe
,bill.receive_date receiveDate, ,bill.receive_date receiveDate,
bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status,bill.starttime,
bill.pay_date payDate,expired_day expiredDay,bill.status,bill.starttime,
bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName, bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName,
s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments
from ( from (


Загрузка…
Отмена
Сохранить