diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index e3ce14877..be6b6cce8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -181,7 +181,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.updateTenantInfo(getTenantInfo()); - //wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); + wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 9830f2e74..c6efcbfa4 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -56,8 +56,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(BFVB6iEUCnkWKkyiCcctc1uH9LjBNhFDcsKZYOqQmIZiBfITJCVKkQ==) - password: ENC(pQdhpcVTu0PHMTt+MXZ6VAm8IO5fzCjb) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index fb0f0a2fc..919b2ce68 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -361,7 +361,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index d1d526d86..14f822c72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -349,7 +349,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - property.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + property.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } datalist.add(property); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 2083ee835..af52ac455 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -455,7 +455,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } datalist.add(rent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 9dc9a97e4..d20737372 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -220,7 +220,9 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { sb.append(phone).append(","); } } - wxmsg.setPhones(sb.deleteCharAt(sb.length()-1).toString()); + if(StringUtils.isNotBlank(sb)){ + wxmsg.setPhones(sb.deleteCharAt(sb.length()-1).toString()); + } if(wxmsg.getPhones().equals("")){ return new ResultData(ErrorCode.MSG_NO_VALID_PHONE); } diff --git a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java index 741c2d792..d7f459d93 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.enums.EnumCouponUnit; import com.iformall.utils.MapUtil; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Consts; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -156,7 +157,9 @@ public class TJDUtil { sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); } } - sb.deleteCharAt(sb.length()-1);// ? + if(StringUtils.isNotBlank(sb)){ + sb.deleteCharAt(sb.length()-1);// ? + } sb.append(keysign); logger.debug("签名前的字符串输出:"+sb.toString()); String signValue = md5(sb.toString()).toUpperCase(); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index f0653dba5..c19970a6c 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -245,9 +245,9 @@ - + select s.id as id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,s.build_area buildArea, + s.img_url imgUrl,s.operation_area operationArea, s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,s.create_date as createDate from wx_shop s @@ -255,7 +255,7 @@ left join wx_mall_floor f on s.floor=f.id where s.is_del=0 - +