Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
78698fdf12
Se han modificado 2 ficheros con 28 adiciones y 1 borrados
  1. +26
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 26
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Ver fichero

@@ -632,6 +632,19 @@ public class WxAllBillController extends BillBaseController {
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
//放开时间 //放开时间
//wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); //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()); wxMerchant.setNeedPayNoDays(EnumYesOrNo.YES.getCode());
List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant); List<WxAllBill> list = billAllHelper.getMerchantBillList(wxMerchant);
if (null != list && list.size() > 0 ) { if (null != list && list.size() > 0 ) {
@@ -669,6 +682,19 @@ public class WxAllBillController extends BillBaseController {
if (null == wxMerchant.getId()) { if (null == wxMerchant.getId()) {
return new ResultData(Result.ERROR,"请选择商户"); 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.setIsPreview(EnumYesOrNo.NO.getCode());
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode());


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Ver fichero

@@ -490,5 +490,6 @@ public class WxMerchant extends TenantEntity {
public Long templateId; public Long templateId;
@TableField(exist = false) @TableField(exist = false)
public String searchKey; public String searchKey;
@TableField(exist = false)
public String feesIdListStr;
} }

Cargando…
Cancelar
Guardar