|
|
@@ -289,6 +289,12 @@ public class WxAllBillController extends BillBaseController { |
|
|
if (null != wxShop.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxShop.getOnlyOwe().intValue()) { |
|
|
if (null != wxShop.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxShop.getOnlyOwe().intValue()) { |
|
|
wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
WxShopUsers su = wxShopSerivce.getCurrentShopUser(ws, ws.getId()); |
|
|
|
|
|
if (null != su) { |
|
|
|
|
|
vo.setCusName(su.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//根据科目来 |
|
|
//根据科目来 |
|
|
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxShop,starttime, enttime); |
|
|
List<WxBillSum> sumList = billAllHelper.getFeesBillSum(wxShop,starttime, enttime); |
|
|
if (null == sumList ) { |
|
|
if (null == sumList ) { |
|
|
@@ -301,6 +307,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
BigDecimal needpay = new BigDecimal(0); |
|
|
BigDecimal needpay = new BigDecimal(0); |
|
|
BigDecimal paid = new BigDecimal(0); |
|
|
BigDecimal paid = new BigDecimal(0); |
|
|
BigDecimal owe = new BigDecimal(0); |
|
|
BigDecimal owe = new BigDecimal(0); |
|
|
|
|
|
BigDecimal returnPay = new BigDecimal(0); |
|
|
for (int i = 0 ; i < sumList.size() ; i ++) { |
|
|
for (int i = 0 ; i < sumList.size() ; i ++) { |
|
|
WxBillSum s = sumList.get(i); |
|
|
WxBillSum s = sumList.get(i); |
|
|
if (null != s.getEnergyFeesId() && null != feesMap) { |
|
|
if (null != s.getEnergyFeesId() && null != feesMap) { |
|
|
@@ -312,11 +319,13 @@ public class WxAllBillController extends BillBaseController { |
|
|
needpay = needpay.add(s.getNeedPayNumber()); |
|
|
needpay = needpay.add(s.getNeedPayNumber()); |
|
|
paid = paid.add(s.getPaidNumber()); |
|
|
paid = paid.add(s.getPaidNumber()); |
|
|
owe = owe.add(s.getOweNumber()); |
|
|
owe = owe.add(s.getOweNumber()); |
|
|
|
|
|
returnPay = returnPay.add(s.getReturnPayNumber()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
vo.setNeedPay(needpay.toPlainString()); |
|
|
vo.setNeedPay(needpay.toPlainString()); |
|
|
vo.setPaid(paid.toPlainString()); |
|
|
vo.setPaid(paid.toPlainString()); |
|
|
vo.setOwe(owe.toPlainString()); |
|
|
vo.setOwe(owe.toPlainString()); |
|
|
|
|
|
vo.setReturnPay(returnPay.toPlainString()); |
|
|
vo.setBillSumList(sumList); |
|
|
vo.setBillSumList(sumList); |
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
@@ -325,19 +334,18 @@ public class WxAllBillController extends BillBaseController { |
|
|
@PostMapping("viewSettleTemplate") |
|
|
@PostMapping("viewSettleTemplate") |
|
|
@TenantIgnore |
|
|
@TenantIgnore |
|
|
public ResultData viewSettleTemplate(@RequestBody WxShop wxShop) { |
|
|
public ResultData viewSettleTemplate(@RequestBody WxShop wxShop) { |
|
|
// if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { |
|
|
|
|
|
// return new ResultData(Result.ERROR,"清选择商户和科目"); |
|
|
|
|
|
// } |
|
|
|
|
|
// merchant.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
// WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant); |
|
|
|
|
|
// WxShopBillVo vo = getMerchantBillVo(merchant); |
|
|
|
|
|
// if (null != ab) { |
|
|
|
|
|
// vo.setMallBankAccount(ab.getBankCardId()); |
|
|
|
|
|
// vo.setMallBankAccountName(ab.getBankName()); |
|
|
|
|
|
// vo.setMallBankName(ab.getBankAccountName()); |
|
|
|
|
|
// } |
|
|
|
|
|
// return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo)); |
|
|
|
|
|
return new ResultData(); |
|
|
|
|
|
|
|
|
if (null == wxShop.getId() || null == wxShop.getTemplateId() ||null == wxShop.getFeesIdList() || wxShop.getFeesIdList().size() <= 0 ) { |
|
|
|
|
|
return new ResultData(Result.ERROR,"清选择商户和科目"); |
|
|
|
|
|
} |
|
|
|
|
|
wxShop.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(wxShop); |
|
|
|
|
|
WxShopBillVo vo = getMerchantBillVo(wxShop); |
|
|
|
|
|
if (null != ab) { |
|
|
|
|
|
vo.setMallBankAccount(ab.getBankCardId()); |
|
|
|
|
|
vo.setMallBankAccountName(ab.getBankName()); |
|
|
|
|
|
vo.setMallBankName(ab.getBankAccountName()); |
|
|
|
|
|
} |
|
|
|
|
|
return new ResultData(wxFinancePrintService.parseTemplateData(wxShop.getTenantId(),wxShop.getTemplateId(),wxShop.getFeesIdList(),vo)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|