|
|
|
@@ -632,6 +632,19 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
//放开时间 |
|
|
|
//wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); |
|
|
|
if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) { |
|
|
|
String[] feesidstrs = wxMerchant.getFeesIdListStr().split(","); |
|
|
|
if (null != feesidstrs) { |
|
|
|
List<Long> feesidList = new ArrayList<Long>(); |
|
|
|
for (int i = 0 ; i < feesidstrs.length ; i ++) { |
|
|
|
String s = feesidstrs[i]; |
|
|
|
if (StringUtils.isNotBlank(s)) { |
|
|
|
feesidList.add(Long.parseLong(s)); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setFeesIdList(feesidList); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode()); |
|
|
|
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
@@ -669,6 +682,19 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
if (null == wxMerchant.getId()) { |
|
|
|
return new ResultData(Result.ERROR,"请选择商户"); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(wxMerchant.getFeesIdListStr())) { |
|
|
|
String[] feesidstrs = wxMerchant.getFeesIdListStr().split(","); |
|
|
|
if (null != feesidstrs) { |
|
|
|
List<Long> feesidList = new ArrayList<Long>(); |
|
|
|
for (int i = 0 ; i < feesidstrs.length ; i ++) { |
|
|
|
String s = feesidstrs[i]; |
|
|
|
if (StringUtils.isNotBlank(s)) { |
|
|
|
feesidList.add(Long.parseLong(s)); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setFeesIdList(feesidList); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); |
|
|
|
|