From ff685f14d6fedb29642bf700b6fe314f18f7564b Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 19 Sep 2018 11:25:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[upgrade=20common-lang3][=E6=95=B4=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- .../com/iformall/interceptor/AuthorizationInterceptor.java | 2 +- .../com/iformall/service/impl/CouponInjectServiceImpl.java | 2 +- .../com/iformall/service/impl/WxRefundOrderServiceImpl.java | 2 +- pom.xml | 5 ----- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index b777be559..9d8504466 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -6,7 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.exception.MallinkException; import com.iformall.service.WxMerchantBUserService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index adcc68096..1a7cdf7dd 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -6,7 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxCUser; import com.iformall.exception.MallinkException; import com.iformall.service.WxCUserService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java index 2612a7d17..44a9b1a1a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java @@ -13,7 +13,7 @@ import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumCouponValidType; import com.iformall.mapper.CouponInjectMapper; import com.iformall.service.*; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 1e7636d43..027dfab12 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -22,7 +22,7 @@ import com.iformall.service.WxRefundOrderService; import com.iformall.utils.BeanUtils; import com.iformall.utils.Utility; import com.iformall.utils.XmlUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/pom.xml b/pom.xml index 72ee38b6d..4c9734fcc 100644 --- a/pom.xml +++ b/pom.xml @@ -176,11 +176,6 @@ - - commons-lang - commons-lang - 2.6 - From 24a1399d45078a9f6d1cbe09473c984201f24a1f Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 19 Sep 2018 14:07:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]:=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=8F=8A?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCUserBasicInfoController.java | 11 ++++++++++- .../java/com/iformall/domain/po/WxCUserBasicInfo.java | 1 + .../service/impl/WxCUserBasicInfoServiceImpl.java | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index ebd4df0ea..5e8588d1f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -55,7 +55,16 @@ public class WxCUserBasicInfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo, Integer pageNum, Integer pageSize) { - if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfo(); + if (null == wxCUserBasicInfo) { + wxCUserBasicInfo = new WxCUserBasicInfo(); + } else { + if (StringUtils.isBlank(wxCUserBasicInfo.getPhone())) { + wxCUserBasicInfo.setPhone(null); + } + if (StringUtils.isBlank(wxCUserBasicInfo.getName())) { + wxCUserBasicInfo.setName(null); + } + } String tenantId = getTenantId(); wxCUserBasicInfo.setTenantId(tenantId); PageInfo page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 071bb2963..524ed1aff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -105,6 +105,7 @@ public class WxCUserBasicInfo implements Serializable { @Transient private String tagIds; @Transient + @Excel(name="标签",width = 20,orderNum = "9") private String tagNames; @Transient private long count; 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 e54f70961..01a73040a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -134,6 +134,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { Cell addrCellTwo = rowtwo.createCell(6); Cell updateDateCellTwo = rowtwo.createCell(7); Cell createDateCellTwo = rowtwo.createCell(8); + Cell tagCellTwo = rowtwo.createCell(9); nameCellTwo.setCellValue("姓名"); sexCellTwo.setCellValue("性别"); @@ -144,6 +145,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { addrCellTwo.setCellValue("地址"); updateDateCellTwo.setCellValue("上次活跃时间"); createDateCellTwo.setCellValue("注册时间"); + tagCellTwo.setCellValue("标签"); for (int i = 0; i < memberlist.size(); i++) { rowtwo = sheetTwo.createRow(i + 1); @@ -156,6 +158,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { addrCellTwo = rowtwo.createCell(6); updateDateCellTwo = rowtwo.createCell(7); createDateCellTwo = rowtwo.createCell(8); + tagCellTwo = rowtwo.createCell(9); WxCUserBasicInfo entity = memberlist.get(i); @@ -173,6 +176,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { addrCellTwo.setCellValue(entity.getAddress()); updateDateCellTwo.setCellValue(sdf.format(entity.getUpdateDate())); createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate())); + } @@ -244,6 +248,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { Cell addrCellTwo = rowtwo.createCell(6); Cell updateDateCellTwo = rowtwo.createCell(7); Cell createDateCellTwo = rowtwo.createCell(8); + Cell tagCellTwo = rowtwo.createCell(9); nameCellTwo.setCellValue("姓名"); sexCellTwo.setCellValue("性别"); @@ -254,6 +259,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { addrCellTwo.setCellValue("地址"); updateDateCellTwo.setCellValue("上次活跃时间"); createDateCellTwo.setCellValue("注册时间"); + tagCellTwo.setCellValue("标签"); FileOutputStream fileOut = new FileOutputStream(file); workbook.write(fileOut);