|
|
|
@@ -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)); |
|
|
|
} |
|
|
|
|
|
|
|
|