Преглед изворни кода

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter пре 1 година
родитељ
комит
0899609830
2 измењених фајлова са 13 додато и 1 уклоњено
  1. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 3
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Прегледај датотеку

@@ -633,6 +633,7 @@ public class WxAllBillController extends BillBaseController {
if (null == wxMerchant.getId()) { if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户"); return new ResultData(Result.ERROR,"请选择商户");
} }
//wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); wxMerchant.setNeedPayPreDays(getNearBillBeforeDays());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
@@ -671,8 +672,9 @@ public class WxAllBillController extends BillBaseController {
if (null == wxMerchant.getId()) { if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户"); return new ResultData(Result.ERROR,"请选择商户");
} }
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode());
//wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
if (null != list && list.size() > 0 ) { if (null != list && list.size() > 0 ) {
List<Long> merchnatIds = new ArrayList<Long>(); List<Long> merchnatIds = new ArrayList<Long>();


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Прегледај датотеку

@@ -658,6 +658,16 @@ public class WxFinanceServiceImpl implements WxFinanceService {
createFinanceReceiveBill(addreceive,bill,be.getCurrentSetOff(),null,Constant.bill_pay_way_setoff); createFinanceReceiveBill(addreceive,bill,be.getCurrentSetOff(),null,Constant.bill_pay_way_setoff);
//处理预充关联 //处理预充关联
createFinanceReceiveSetoff(addreceive,be,bill); createFinanceReceiveSetoff(addreceive,be,bill);
WxBillPayDTO payDto = new WxBillPayDTO();
payDto.updateTenantInfo(addreceive);
payDto.setId(be.getId());
payDto.setBillTypeValue(be.getBillType());
payDto.setAddpay("0");
payDto.setSetOff(be.getCurrentSetOff());
payDto.setPayWay(Constant.bill_pay_way_setoff);
payDto.setPayWayObject(payWay0);
payDto.setRemark("收款单收款["+addreceive.getId()+"]冲抵"+addreceive.getRemark());
wxBillAllHelper.updatePay(payDto, user);
} }
return noNeedCreate; return noNeedCreate;
} }


Loading…
Откажи
Сачувај