Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
da4734b500
3 changed files with 13 additions and 5 deletions
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  3. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java View File

@@ -18,6 +18,7 @@ import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.WxBillBad;
@@ -228,6 +229,8 @@ public class WxAllBillController extends BillBaseController {
vo.setMerchantName(m.getName());
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m));
vo.setRentArea(billAllHelper.getMerchantShopRentArea(m));
vo.setStarttime(starttime);
vo.setEndtime(enttime);
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode());
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) {
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays());
@@ -271,7 +274,14 @@ public class WxAllBillController extends BillBaseController {
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);
WxMerchantBillVo vo = getMerchantBillVo(merchant);
if (null != ab) {
vo.setMallBankAccount(ab.getBankCardId());
vo.setMallBankAccountName(ab.getBankAccountName());
vo.setMallBankName(ab.getBankName());
}
return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo));
}


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java View File

@@ -93,10 +93,10 @@ public class WxMerchantBillVo implements Serializable {
@TableField(exist = false)
private Date endtime;
@TableField(exist = false)
private Date mallBankAccountName;
private String mallBankAccountName;
@TableField(exist = false)
private Date mallBankName;
private String mallBankName;
@TableField(exist = false)
private Date mallBankAccount;
private String mallBankAccount;
}

+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java View File

@@ -315,8 +315,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
bq.setShopNumber("");
}
//打哪些科目
List<Long> feesId = dataIds;
List<PrintVo> voList = new ArrayList<PrintVo>();


Loading…
Cancel
Save