diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java index 52efe3cca..59f6f3e40 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java @@ -25,8 +25,7 @@ public interface WxAllBillMapper extends CommonMapper { List getShopIdList(WxAllBill record); - BigDecimal getMerchantAdvanceGroupSum(WxAllBill wxBillRent); - BigDecimal getMerchantDepositGroupSum(WxAllBill wxBillRent); + BigDecimal getRemainAdvanceSum(WxAllBill wxBillRent); List getMerchantAdvanceGroupSumList(WxAllBill wxBillRent); List getBillNotifyList(WxAllBill record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxAllBillService.java b/mallinkService/src/main/java/com/iformall/service/WxAllBillService.java index 24c923ce8..374c804c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAllBillService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAllBillService.java @@ -57,8 +57,7 @@ public interface WxAllBillService { void completeBill(EnumBillStatus status,WxShop wxShop,MallUserInfo user); - BigDecimal getBillSetoffSum(WxAllBill wxBillRent); - BigDecimal getBillDepositSum(WxAllBill wxBillRent); + BigDecimal getRemainAdvanceSum(WxAllBill wxBillRent); List getMerchantAdvanceGroupSumList(WxAllBill wxBillRent); List list(WxAllBill record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 27cd732ac..9d131cfdf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -545,17 +545,11 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } @Override - public BigDecimal getBillSetoffSum(WxAllBill record) { + public BigDecimal getRemainAdvanceSum(WxAllBill record) { updateQueryParam(record); - return wxAllBillMapper.getMerchantAdvanceGroupSum(record); + return wxAllBillMapper.getRemainAdvanceSum(record); } - @Override - public BigDecimal getBillDepositSum(WxAllBill record) { - updateQueryParam(record); - return wxAllBillMapper.getMerchantDepositGroupSum(record); - } - @Override public List getMerchantAdvanceGroupSumList(WxAllBill record) { updateQueryParam(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 2362272a3..29e358133 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -261,7 +261,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { abq.updateTenantInfo(record); abq.setShopId(record.getId()); abq.setDepositHasMoney(EnumYesOrNo.YES.getCode()); - BigDecimal total = wxAllBillService.getBillDepositSum(abq); + BigDecimal total = wxAllBillService.getRemainAdvanceSum(abq); if (null == total) { total = new BigDecimal(0); } @@ -277,7 +277,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { abq.setBillType(EnumBillAllType.ADVANCE.getCode()); abq.setShopId(record.getId()); abq.setAdvanceHasMoney(EnumYesOrNo.YES.getCode()); - BigDecimal total = wxAllBillService.getBillSetoffSum(abq); + BigDecimal total = wxAllBillService.getRemainAdvanceSum(abq); if (null == total) { total = new BigDecimal(0); } diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 9c3c49074..8b4697f71 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -218,15 +218,8 @@ - - - - + select sum(CAST(ifnull(pay,'0') AS DECIMAL(20,2)) - CAST(ifnull(return_pay,'0') AS DECIMAL(20,2)) - CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) from wx_all_bill