Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
9c8960dc26
3 zmienionych plików z 49 dodań i 2 usunięć
  1. +47
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 47
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Wyświetl plik

@@ -214,6 +214,53 @@ public class WxAllBillController extends BillBaseController {
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
} }
wxMerchant.setBillType(EnumBillAllType.RENT.getCode());
WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode());
WxBillSum rentBussinessManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.RENT_OPERATION_MANAGE.getCode());
WxBillSum rentOperationManageSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
WxBillSum rentDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.PROPERTY.getCode());
WxBillSum propertySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.PROPERTY_DEPOSIT.getCode());
WxBillSum propertyDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.DAILY.getCode());
WxBillSum dailySum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.OTHER.getCode());
WxBillSum otherSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
wxMerchant.setBillType(EnumBillAllType.OTHER_DEPOSIT.getCode());
WxBillSum otherDepositSum = billAllHelper.getBillSum(wxMerchant, starttime, enttime);
vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(),
propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay()));
vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(),
propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid()));
vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(),
propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe()));
List<WxBillSum> sumlist = new ArrayList<>();
sumlist.add(rentSum);
sumlist.add(rentBussinessManageSum);
sumlist.add(rentOperationManageSum);
sumlist.add(rentDepositSum);
sumlist.add(propertySum);
sumlist.add(propertyDepositSum);
sumlist.add(dailySum);
sumlist.add(otherSum);
sumlist.add(otherDepositSum);
vo.setBillSumList(sumlist);
return new ResultData(vo); return new ResultData(vo);
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Wyświetl plik

@@ -118,7 +118,7 @@ public class WxBillAllHelper {
return wxAllBillService.getBillHotNotify(br); return wxAllBillService.getBillHotNotify(br);
} }
private String calcuteSum(String... money) {
public String calcuteSum(String... money) {
if (null != money) { if (null != money) {
BigDecimal total = new BigDecimal(0); BigDecimal total = new BigDecimal(0);
for (int i = 0 ; i < money.length ; i++) { for (int i = 0 ; i < money.length ; i++) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Wyświetl plik

@@ -182,7 +182,7 @@
bill_type, bill_type,
count(1) total_count , count(1) total_count ,
sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)) + CAST(IFNULL(`return_pay`,'0') AS DECIMAL(20,2))) total_money, sum(CAST(`receive_pay` AS DECIMAL(20,2)) - CAST(`pay` AS DECIMAL(20,2)) - CAST(IFNULL(`set_off`,'0') AS DECIMAL(20,2)) + CAST(IFNULL(`return_pay`,'0') AS DECIMAL(20,2))) total_money,
MIN(br.starttime) min_begin_time from wx_all_bill
MIN(starttime) min_begin_time from wx_all_bill
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
group by bill_type group by bill_type
</select> </select>


Ładowanie…
Anuluj
Zapisz