From 49e01cab81aeb2e2f750c49a692467710262864a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 30 Sep 2018 13:57:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2][=E6=96=B0=E5=A2=9E]:=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxCUserBasicInfo.java | 18 ++++++++++++++++++ .../mapper/WxCUserBasicInfoMapper.xml | 3 +++ 2 files changed, 21 insertions(+) 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 d8cbc5860..c47de0714 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -109,6 +109,10 @@ public class WxCUserBasicInfo implements Serializable { private String tagNames; @Transient private long count; + @Transient + private Date startTime; + @Transient + private Date endTime; public String getLevel() { return level; @@ -225,7 +229,21 @@ public class WxCUserBasicInfo implements Serializable { name = _name; } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + public void setEndTime(Date endTime) { + this.endTime = endTime; + } public static enum Field { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 58738b29e..db24090d7 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -78,6 +78,9 @@ and `name` like concat('%', #{name},'%') + + and `create_date` between #{startTime} and #{endTime} + and id in From 8404ead95c457f3dd5608882c006c82d7fa3c080 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 30 Sep 2018 18:52:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AF][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxLevelConfigController.java | 8 +- .../iformall/mapper/WxLevelConfigMapper.java | 2 +- .../service/WxLevelConfigService.java | 2 +- .../impl/WxLevelConfigServiceImpl.java | 4 +- .../resources/mapper/WxLevelConfigMapper.xml | 120 +++++++++--------- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java index a1ec54ef0..20e3049ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java @@ -52,14 +52,18 @@ public class WxLevelConfigController extends BaseController { String[] points = dto.getPoints().split("&"); String[] level = dto.getLevel().split("&"); String[] descs =dto.getDescription().split("&"); + if (points.length != level.length) { + return new ResultData(Result.ERROR, "请同时设置成长值和等级"); + } String tenantId = getTenantId(); - wxLevelConfigService.deleteAll(); + wxLevelConfigService.deleteAll(tenantId); for(int i=0;i 0 && i < descs.length) + wxLevelConfig.setDescription(descs[i]); wxLevelConfigService.saveOrUpdate(wxLevelConfig); } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java index 18f5c2b0e..54daa248a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java @@ -10,7 +10,7 @@ public interface WxLevelConfigMapper extends CommonMapper { List findList(WxLevelConfig wxLevelConfig); - void deleteAll(); + void deleteAll(@Param("tenantId")String tenantId); String getLevel(@Param("tenantId")String tenantId,@Param("poins")Integer poins); diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index 70e894f4a..9dd2de352 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -47,7 +47,7 @@ public interface WxLevelConfigService { void deleteById(Long id); - void deleteAll(); + void deleteAll(String tenantId); /** * 根据积分获取会员等级 * @param tenantId diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 560155eb5..30a87e41c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -57,8 +57,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } @Override - public void deleteAll() { - wxLevelConfigMapper.deleteAll(); + public void deleteAll(String tenantId) { + wxLevelConfigMapper.deleteAll(tenantId); } diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 852c28334..2f58658b1 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -1,72 +1,68 @@ - - - - - - - - - - + + + + + + + + + + `id`,`points`,`level`,`description`,`create_date`,`tenant_id` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `points` = #{points} - - - - - and `level` like concat('%', #{level},'%') - - - - - and `description` like concat('%', #{description},'%') - - - - - and `create_date` = #{createDate} - - - - - and `tenant_id` = #{tenantId} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - delete from wx_level_config; - + + where 1 = 1 + + + and `id` = #{id} + + + + and `points` = #{points} + + + + and `level` like concat('%', #{level},'%') + + + + and `description` like concat('%', #{description},'%') + - + select + + from wx_level_config + + + + + delete from wx_level_config where `tenant_id` = #{tenantId}; + + + - - + + From be194fa15059067aa583e0e46e09cbfb08423383 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 30 Sep 2018 23:25:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=88=B8=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index c232b149e..7d18a0990 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumCouponStatus; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxMerchantService; @@ -146,9 +147,11 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { WxCoupon c = wxCouponService.getById(id); + WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); + if(merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) + return new ResultData(Result.ERROR, "此券的商户已禁用"); WxCounponDto dto = new WxCounponDto(); org.springframework.beans.BeanUtils.copyProperties(c, dto); - WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); dto.setWxMerchant(merchant); return new ResultData(Result.SUCCESS, "查询成功", dto); }