From 0cf8e4ffc1574f7d76bfe5b4f443e5bb75c6fc8a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 22 Sep 2018 22:22:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E5=9B=9E=E8=B0=83][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0ID]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 3 ++- mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 1fa447bea..4f5b89a4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -72,8 +72,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgConfig = list.get(0); wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); - + final IdWorker idWorker = IdWorker.get(); for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { + wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setTenantId(wxMsgConfig.getTenantId()); wxMsgCallback.setSign(sign); wxMsgCallback.setCreatetime(new Date()); diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index 3236b286e..f15281fc7 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -50,7 +50,7 @@ - and `bid` like concat('%', #{bid},'%') + and `bid` = #{bid} From f98493413e1dfb698880eda84106bb0e77638dfb Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 22:28:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 900d9213a..3ffc258a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -143,25 +143,27 @@ public class WxCUserBasicInfoController extends BaseController { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if (StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - WxTags wxTags = new WxTags(); - wxTags.setIds(ids); - PageInfo page = wxTagsService.listAsPage(wxTags, 1, 5000); - String tagNames = ""; - String tagIds = ""; - List tagIdList = new ArrayList<>(); - for (WxTags wt : page.getList()) { - tagNames += wt.getName() + "/"; - tagIds += wt.getId() + ","; - tagIdList.add(wt.getId()); + if (ids.size() > 0) { + WxTags wxTags = new WxTags(); + wxTags.setIds(ids); + PageInfo page = wxTagsService.listAsPage(wxTags, 1, 5000); + String tagNames = ""; + String tagIds = ""; + List tagIdList = new ArrayList<>(); + for (WxTags wt : page.getList()) { + tagNames += wt.getName() + "/"; + tagIds += wt.getId() + ","; + tagIdList.add(wt.getId()); + } + if (StringUtils.isNotBlank(tagNames)) { + info.setTagNames(tagNames.substring(0, tagNames.length() - 1)); + } + if (StringUtils.isNoneBlank(tagIds)) { + info.setTagIds(tagIds.substring(0, tagIds.length() - 1)); + } + long count = wxCUserTagsService.findCountByTag(getTenantId(), tagIdList); + info.setCount(count); } - if (StringUtils.isNotBlank(tagNames)) { - info.setTagNames(tagNames.substring(0, tagNames.length() - 1)); - } - if (StringUtils.isNoneBlank(tagIds)) { - info.setTagIds(tagIds.substring(0, tagIds.length() - 1)); - } - long count = wxCUserTagsService.findCountByTag(getTenantId(), tagIdList); - info.setCount(count); } } } else { From 31b60ef120d82603796e7eac83a8d6345adc7283 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 22:41:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[ids=E5=BC=82=E5=B8=B8=E9=87=8D=E6=95=B4][?= =?UTF-8?q?=E9=87=8D=E6=95=B4]:=E5=A6=82=E6=9E=9Cids=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E4=B8=8D=E5=BE=80=E4=B8=8B=E7=BB=A7=E7=BB=AD=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8Dsql=E5=BC=82=E5=B8=B8=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CouponInjectController.java | 4 ++- .../impl/WxCUserBasicInfoServiceImpl.java | 36 ++++++++++--------- .../service/impl/WxCampaignServiceImpl.java | 10 ++++-- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java index 97f873c3b..3cbf0d339 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java @@ -91,7 +91,9 @@ public class CouponInjectController extends BaseController { CouponInject couponInject = couponInjectService.getById(id); if (couponInject != null) { List tagids = JSON.parseArray(couponInject.getTags(), Long.class); - couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); + if (tagids.size() > 0) { + couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); + } } return new ResultData(Result.SUCCESS, "查询成功", couponInject); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 818ff2502..f1272ad2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -209,23 +209,25 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); if (StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - WxTags wxTagsQ = new WxTags(); - wxTagsQ.setIds(ids); - List tagList = wxTagsMapper.findList(wxTagsQ); - String tagNames = ""; - String tagIds = ""; - List tagIdList = new ArrayList<>(); - for (WxTags wt : tagList) { - tagNames += wt.getName() + "/"; - tagIds += wt.getId() + ","; - tagIdList.add(wt.getId()); - } - if (StringUtils.isNotBlank(tagNames)) { - entity.setTagNames(tagNames.substring(0, tagNames.length() - 1)); - tagCellTwo.setCellValue(entity.getTagNames()); - } - if (StringUtils.isNoneBlank(tagIds)) { - entity.setTagIds(tagIds.substring(0, tagIds.length() - 1)); + if (ids.size() > 0) { + WxTags wxTagsQ = new WxTags(); + wxTagsQ.setIds(ids); + List tagList = wxTagsMapper.findList(wxTagsQ); + String tagNames = ""; + String tagIds = ""; + List tagIdList = new ArrayList<>(); + for (WxTags wt : tagList) { + tagNames += wt.getName() + "/"; + tagIds += wt.getId() + ","; + tagIdList.add(wt.getId()); + } + if (StringUtils.isNotBlank(tagNames)) { + entity.setTagNames(tagNames.substring(0, tagNames.length() - 1)); + tagCellTwo.setCellValue(entity.getTagNames()); + } + if (StringUtils.isNoneBlank(tagIds)) { + entity.setTagIds(tagIds.substring(0, tagIds.length() - 1)); + } } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 8a45923ac..0a167fe54 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -61,10 +61,14 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCampaignMapper.updateByPrimaryKeySelective(record); } record = wxCampaignMapper.selectByPrimaryKey(record); - if (record.getStatus() == 0) - addOrUpdateBatch(JSONArray.parseArray(record.getCouponIds(),String.class),record); - else + if (record.getStatus() == 0) { + List ids= JSONArray.parseArray(record.getCouponIds(),String.class); + if (ids.size() > 0) { + addOrUpdateBatch(ids, record); + } + } else { delBatch(record); + } } public void delBatch(WxCampaign record) { From 74af83eb3df8468bb38ffc77002588e206f6e720 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 22 Sep 2018 22:48:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E5=9B=9E=E8=B0=83][?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index 4f5b89a4d..bbecd9e7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -72,9 +72,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgConfig = list.get(0); wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); - final IdWorker idWorker = IdWorker.get(); for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { - wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setTenantId(wxMsgConfig.getTenantId()); wxMsgCallback.setSign(sign); wxMsgCallback.setCreatetime(new Date()); From 80b673ffea6773a4e462f1c304251ff9a3530441 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 23 Sep 2018 00:36:15 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[ids=E5=A4=84=E7=90=86rollback][=E9=87=8D?= =?UTF-8?q?=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/CouponInjectController.java | 2 +- .../com/iformall/controller/WxCUserBasicInfoController.java | 2 +- .../com/iformall/service/impl/WxCampaignServiceImpl.java | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java index 3cbf0d339..b8143d028 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java @@ -91,7 +91,7 @@ public class CouponInjectController extends BaseController { CouponInject couponInject = couponInjectService.getById(id); if (couponInject != null) { List tagids = JSON.parseArray(couponInject.getTags(), Long.class); - if (tagids.size() > 0) { + if (!tagids.isEmpty()) { couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 3ffc258a8..0642188b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -143,7 +143,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if (StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - if (ids.size() > 0) { + if (!ids.isEmpty()) { WxTags wxTags = new WxTags(); wxTags.setIds(ids); PageInfo page = wxTagsService.listAsPage(wxTags, 1, 5000); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 0a167fe54..f63223967 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -62,10 +62,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { } record = wxCampaignMapper.selectByPrimaryKey(record); if (record.getStatus() == 0) { - List ids= JSONArray.parseArray(record.getCouponIds(),String.class); - if (ids.size() > 0) { - addOrUpdateBatch(ids, record); - } + addOrUpdateBatch(JSONArray.parseArray(record.getCouponIds(),String.class), record); } else { delBatch(record); } From cdaf01ef5f88b6247ecbda642de376395eb77806 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 23 Sep 2018 00:36:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96][=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxCUserBasicInfoServiceImpl.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index f1272ad2e..f2f2eed11 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,13 +1,10 @@ package com.iformall.service.impl; import cn.afterturn.easypoi.excel.ExcelImportUtil; -import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; -import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; -import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; @@ -40,14 +37,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.persistence.Transient; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotNull; import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -209,7 +207,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); if (StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - if (ids.size() > 0) { + if (!ids.isEmpty()) { WxTags wxTagsQ = new WxTags(); wxTagsQ.setIds(ids); List tagList = wxTagsMapper.findList(wxTagsQ); @@ -492,17 +490,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { List failList = datalist.getFailList(); logger.info("验证通过的数量:" + successList.size()); logger.info("验证未通过的数量:" + failList.size()); - for(CUserBaseInfoT uBase: successList) { + for (CUserBaseInfoT uBase : successList) { + if (StringUtils.isBlank(uBase.getPhone())) { + logger.error("手机号为空", uBase.toString()); + continue; + } WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId); if (userBase == null) { continue; } Date curDate = new Date(); - if (StringUtils.isBlank(userBase.getPhone())) { - logger.error("手机号为空", userBase.toString()); - continue; - } + WxCUserBasicInfo oldUserBase = null; WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); userBaseQ.setTenantId(tenantId); From de373f90f6c4df830bf9c6f97f2e975e48b73a03 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 23 Sep 2018 00:47:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[=E8=84=8F=E6=95=B0=E6=8D=AE=E5=BC=95?= =?UTF-8?q?=E5=8F=91=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA=E4=B8=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-prod.yml | 5 +++++ .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index bd0f1a701..0c0f5a5c1 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -33,6 +33,11 @@ spring: max-wait: -1 min-idle: 0 + +fileUpload: + path: /home/test/images + server: http://202.165.179.86:8081/images + logging: level: tk.mybatis: debug diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index f2f2eed11..99a2608f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -205,7 +205,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { if (entity != null) { if (entity.getTagId() != null) { WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); - if (StringUtils.isNotBlank(uTag.getTags())) { + if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); if (!ids.isEmpty()) { WxTags wxTagsQ = new WxTags();