diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index f5789a701..0bf4040ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -12,6 +12,7 @@ import com.iformall.domain.dto.WxBillPayDTO; import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxBillAction; +import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.WxBillBaseEntity; @@ -30,6 +31,7 @@ import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.SysConfigService; import com.iformall.service.WxBillActionService; +import com.iformall.service.WxFinanceService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; import com.iformall.service.helper.WxBillAllHelper; @@ -79,6 +81,9 @@ public class WxBillAllController extends BillBaseController { @Autowired private WxBillActionService wxBillActionService; + @Autowired + WxFinanceService wxFinanceService; + /** * 商户账单汇总计费列表 * @param wxMerchant @@ -564,6 +569,11 @@ public class WxBillAllController extends BillBaseController { if (dto.getBillTypeValue().intValue() == Constant.bill_all_type_manage_fee) { dto.setBillTypeValue(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); } + WxBillPayWay payWay = wxFinanceService.getPayWayById(dto, dto.getPayWay()); + if (null == payWay) { + return new ResultData(Result.ERROR,"支付方式未查询到"); + } + dto.setPayWayObject(payWay); billAllHelper.updatePay(dto, getUser()); return new ResultData(); //return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxBillPayDTO.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxBillPayDTO.java index 02ec170e0..4dca7fbf0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxBillPayDTO.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxBillPayDTO.java @@ -15,7 +15,8 @@ public class WxBillPayDTO extends TenantEntity{ private Long id; private Integer billTypeValue;// EnumBillAllType private String addpay;//支付金额 - private WxBillPayWay payWay;//支付方式 + private WxBillPayWay payWayObject;//支付方式 + private Long payWay;//传值 private String remark; private String image; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPayWay.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPayWay.java index 0378eb4c2..d89762779 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPayWay.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPayWay.java @@ -1,13 +1,11 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; -import java.util.List; /** */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java index b07e8f789..dfe7d447f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java @@ -33,7 +33,9 @@ public class WxBillBaseService{ wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus)); wxBillAction.setAction(billAction.getCode()); wxBillAction.setPayDate(payDate); - wxBillAction.setPayWay(payWay.getId()); + if (null != payWay) { + wxBillAction.setPayWay(payWay.getId()); + } wxBillAction.setRemark(remark); wxBillAction.setUserType(EnumSystemUserType.ADMIN.getCode()); wxBillActionService.modifyBill(wxBillAction, mallUserInfo); @@ -48,7 +50,9 @@ public class WxBillBaseService{ wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus)); wxBillAction.setAction(billAction.getCode()); wxBillAction.setPayDate(payDate); - wxBillAction.setPayWay(payWay.getId()); + if (null != payWay) { + wxBillAction.setPayWay(payWay.getId()); + } wxBillAction.setRemark(remark); wxBillAction.setUserType(EnumSystemUserType.MERCHANT.getCode()); wxBillActionService.modifyBill(wxBillAction, bUser); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 60889cade..3c4597310 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -538,7 +538,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillDaily wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); } private WxBillDaily updateBillPay(WxBillPayDTO dto) { @@ -602,7 +602,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillDailyMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -618,7 +618,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 5547b34d6..da4618cb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -486,7 +486,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillDeposit wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); } private WxBillDeposit updateBillPay(WxBillPayDTO dto) { @@ -531,7 +531,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillDepositMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -547,7 +547,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override @@ -564,7 +564,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); wxBillDepositMapper.updateById(wxBillRent); this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 32687cbe4..e42ecd4b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -496,7 +496,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillOtherDeposit wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), null,null,user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(), null,null,user); } private WxBillOtherDeposit updateBillPay(WxBillPayDTO dto) { @@ -542,7 +542,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillOtherDepositMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -558,7 +558,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), null,null,user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(), null,null,user); } @Override @@ -577,7 +577,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); wxBillOtherDepositMapper.updateById(wxBillRent); this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 13f02476a..ecf6b22d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -441,7 +441,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillOther wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); } private WxBillOther updateBillPay(WxBillPayDTO dto) { @@ -485,7 +485,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillOtherMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -501,7 +501,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 06969db28..d982f9805 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -471,7 +471,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillPropertyDeposit wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(), dto.getRemark(),null,null, user); } private WxBillPropertyDeposit updateBillPay(WxBillPayDTO dto) { @@ -515,7 +515,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen } } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillPropertyDepositMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -531,7 +531,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override @@ -550,7 +550,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString()); wxBillPropertyDepositMapper.updateById(wxBillRent); this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 3b50ea12f..b6af43863 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -584,7 +584,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillProperty wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } private WxBillProperty updateBillPay(WxBillPayDTO dto) { @@ -647,7 +647,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi } } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillPropertyMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -663,7 +663,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index ef8888f70..c209d1d7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -497,7 +497,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillRentManage wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } private WxBillRentManage updateBillPay(WxBillPayDTO dto) { @@ -561,7 +561,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillRentManageMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -577,7 +577,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index d53d8b283..3f69feb74 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -693,7 +693,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe public void updatePay(WxBillPayDTO dto, MallUserInfo user) { WxBillRent wxBillRent = updateBillPay(dto); this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } private WxBillRent updateBillPay(WxBillPayDTO dto) { @@ -756,7 +756,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe } wxBillRent.setPayDate(new Date()); - wxBillRent.setPayWay(dto.getPayWay().getId()); + wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillRentMapper.updateById(wxBillRent); dto.setRemark(sb.toString()); return wxBillRent; @@ -772,7 +772,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe action = EnumBillAction.OFFLINE_PAY; } this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), - dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user); + dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWayObject(),dto.getRemark(),null,null, user); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/payBill/impl/PayBillBaseService.java b/mallinkService/src/main/java/com/iformall/service/payBill/impl/PayBillBaseService.java index 864c62f16..c8a08f0f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/payBill/impl/PayBillBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/payBill/impl/PayBillBaseService.java @@ -24,7 +24,7 @@ public class PayBillBaseService { dto.setId(billId); dto.setBillTypeValue(billType.getCode()); dto.setAddpay(paid); - dto.setPayWay(payWay); + dto.setPayWayObject(payWay); dto.setRemark(remark); WxMerchantBUser buser = wxMerchantBUserService.getById(merchantBUserId);