| @@ -181,7 +181,7 @@ public class WxShopController extends BaseController { | |||||
| wxShop = new WxShop(); | wxShop = new WxShop(); | ||||
| } | } | ||||
| wxShop.updateTenantInfo(getTenantInfo()); | 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<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -56,8 +56,8 @@ spring: | |||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: ENC(BFVB6iEUCnkWKkyiCcctc1uH9LjBNhFDcsKZYOqQmIZiBfITJCVKkQ==) | |||||
| password: ENC(pQdhpcVTu0PHMTt+MXZ6VAm8IO5fzCjb) # 授权密码 | |||||
| username: zhengfangyuan@iformall.com | |||||
| password: xnydCeUzofB2h8qp # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -361,7 +361,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| StringBuffer sb = new StringBuffer(); | StringBuffer sb = new StringBuffer(); | ||||
| Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | ||||
| sets.forEach(x -> sb.append(x.getKey()).append(",")); | 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())); | wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); | ||||
| @@ -349,7 +349,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| StringBuffer sb = new StringBuffer(); | StringBuffer sb = new StringBuffer(); | ||||
| Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | ||||
| sets.forEach(x -> sb.append(x.getKey()).append(",")); | 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); | datalist.add(property); | ||||
| @@ -455,7 +455,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| StringBuffer sb = new StringBuffer(); | StringBuffer sb = new StringBuffer(); | ||||
| Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | Set<Map.Entry<String, Object>> sets = jsonObject.entrySet(); | ||||
| sets.forEach(x -> sb.append(x.getKey()).append(",")); | 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); | datalist.add(rent); | ||||
| @@ -220,7 +220,9 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { | |||||
| sb.append(phone).append(","); | 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("")){ | if(wxmsg.getPhones().equals("")){ | ||||
| return new ResultData(ErrorCode.MSG_NO_VALID_PHONE); | return new ResultData(ErrorCode.MSG_NO_VALID_PHONE); | ||||
| } | } | ||||
| @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; | |||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.iformall.enums.EnumCouponUnit; | import com.iformall.enums.EnumCouponUnit; | ||||
| import com.iformall.utils.MapUtil; | import com.iformall.utils.MapUtil; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.apache.http.Consts; | import org.apache.http.Consts; | ||||
| import org.apache.http.HttpEntity; | import org.apache.http.HttpEntity; | ||||
| import org.apache.http.HttpResponse; | import org.apache.http.HttpResponse; | ||||
| @@ -156,7 +157,9 @@ public class TJDUtil { | |||||
| sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); | 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); | sb.append(keysign); | ||||
| logger.debug("签名前的字符串输出:"+sb.toString()); | logger.debug("签名前的字符串输出:"+sb.toString()); | ||||
| String signValue = md5(sb.toString()).toUpperCase(); | String signValue = md5(sb.toString()).toUpperCase(); | ||||
| @@ -245,9 +245,9 @@ | |||||
| </select> | </select> | ||||
| <select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="java.util.HashMap"> | |||||
| select s.id as id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, | |||||
| s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea, | |||||
| <select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | |||||
| 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.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 | s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,s.create_date as createDate | ||||
| from wx_shop s | from wx_shop s | ||||
| @@ -255,7 +255,7 @@ | |||||
| left join wx_mall_floor f on s.floor=f.id | left join wx_mall_floor f on s.floor=f.id | ||||
| where s.is_del=0 | where s.is_del=0 | ||||
| <!--<if test=" null != id "> | |||||
| <if test=" null != id "> | |||||
| and s.`id` = #{id} | and s.`id` = #{id} | ||||
| </if> | </if> | ||||
| @@ -283,7 +283,7 @@ | |||||
| </if> | </if> | ||||
| <if test="null == sortColumn"> | <if test="null == sortColumn"> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </if>--> | |||||
| </if> | |||||
| </select> | </select> | ||||