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