From aa9430434fe1f5710ac44520497ae60ef67719bc Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 17 Jan 2019 11:59:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82][1000115]:=E9=80=82?= =?UTF-8?q?=E9=85=8DB=E7=AB=AFC=E7=AB=AF=E6=96=B0=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=8A=98=E6=89=A3=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 4 +- .../iformall/controller/WxMemController.java | 62 ++++++++++--------- .../controller/WxMerchantBUserController.java | 57 +++++++---------- .../iformall/controller/WxMallController.java | 14 ----- .../controller/WxUserGrantController.java | 10 +-- .../com/iformall/domain/po/WxMerchant.java | 32 ---------- .../com/iformall/domain/vo/WxMerchantVo.java | 34 ---------- .../enums/EnumLevelConfigDiscountStatus.java | 36 +++++++++++ .../com/iformall/mapper/WxMerchantMapper.java | 7 --- .../service/WxLevelConfigService.java | 4 +- .../iformall/service/WxMerchantService.java | 8 --- .../impl/WxLevelConfigServiceImpl.java | 8 +-- .../service/impl/WxMerchantServiceImpl.java | 5 -- .../resources/mapper/WxMerchantMapper.xml | 29 +-------- 14 files changed, 110 insertions(+), 200 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumLevelConfigDiscountStatus.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index a6a58c362..91632b901 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -74,9 +74,9 @@ public class WxCUserBasicInfoController extends BaseController { private void setUserInfoLevel(WxCUserBasicInfo info) { if (info.getPoins() == null || info.getPoins() == 0) { - info.setLevel("无"); + info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); } else { - info.setLevel("无"); + info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); List levelList = wxLevelConfigService.getByTenantId(info.getTenantId()); for (WxLevelConfig levelConfig : levelList) { if (info.getPoins() >= levelConfig.getPoints()) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java index d0fb623ba..69770c1b0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java @@ -4,6 +4,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCUserVo; +import com.iformall.domain.vo.WxLevelMerchantCVo; +import com.iformall.enums.EnumLevelConfigDiscountStatus; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserService; import com.iformall.service.WxLevelConfigService; @@ -71,42 +73,44 @@ public class WxMemController extends BaseController { WxCUserVo userVo = new WxCUserVo(); org.springframework.beans.BeanUtils.copyProperties(cUser, userVo); - if (userVo.getScore() == null || userVo.getScore() == 0) { - userVo.setLevelName("无"); - userVo.setDiscountRate(10000); // 无折扣 - } else { - userVo.setLevelName("无"); - Integer levelConfigDiscount = null; + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUser.getId()); + if (wxCUserBasicInfo != null) { + userVo.setName(wxCUserBasicInfo.getName()); + userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); + userVo.setSex(wxCUserBasicInfo.getSex()); + userVo.setAddress(wxCUserBasicInfo.getAddress()); + } + userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); + userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); + + - List levelList = wxLevelConfigService.getByTenantId(bUser.getTenantId()); + if (userVo.getScore() != null) { + List levelList = wxLevelConfigService.getByTenantId(userVo.getTenantId()); + + String level = WxLevelConfigService.DEFAULT_LEVEL; + Long levelId = 0L; for(WxLevelConfig levelConfig: levelList) { if (userVo.getScore() >= levelConfig.getPoints()) { - userVo.setLevelId(levelConfig.getId()); - userVo.setLevelName(levelConfig.getLevel()); - levelConfigDiscount = levelConfig.getDiscountEnable(); + if(levelConfig.getDiscountEnable().equals(EnumLevelConfigDiscountStatus.ENABLE.getCode())) + levelId = levelConfig.getId(); + level = levelConfig.getLevel(); } } - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUser.getId()); - if (wxCUserBasicInfo != null) { - userVo.setName(wxCUserBasicInfo.getName()); - userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); - userVo.setSex(wxCUserBasicInfo.getSex()); - userVo.setAddress(wxCUserBasicInfo.getAddress()); - } - if(levelConfigDiscount != null && levelConfigDiscount > 0) { - // 用户折扣率 - WxMerchant wxMerchant = wxMerchantService.getById(bUser.getMerchantId()); - if(wxMerchant != null) { - if(levelConfigDiscount.equals(1)) { // first level - userVo.setDiscountRate(wxMerchant.getVipDiscountRate1()); - } else if(levelConfigDiscount.equals(2)) { // second level - userVo.setDiscountRate(wxMerchant.getVipDiscountRate2()); - } else if(levelConfigDiscount.equals(3)) { // third level - userVo.setDiscountRate(wxMerchant.getVipDiscountRate3()); - } - } + userVo.setLevelId(levelId); + userVo.setLevelName(level); + + WxLevelMerchant levelMerchant = new WxLevelMerchant(); + levelMerchant.setLevelId(levelId); + levelMerchant.setMerchantId(bUser.getMerchantId()); + List levelMerchantList = wxLevelConfigService.findListCVo(levelMerchant); + if (levelMerchantList.size() > 0) { + WxLevelMerchantCVo l = levelMerchantList.get(0); + userVo.setDiscountRate(l.getDiscount()); + } else { + userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 4cc5cedf8..6a4aab29a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -6,6 +6,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCUserVo; +import com.iformall.domain.vo.WxLevelMerchantCVo; +import com.iformall.enums.EnumLevelConfigDiscountStatus; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.interceptor.AuthorizationInterceptor; @@ -133,43 +135,32 @@ public class WxMerchantBUserController extends BaseController { userVo.setScore(userInfo.getPoins()); } - WxLevelConfig curLConfig = null; - int curDiscountRateIndex = 0; - int curDiscountRate = 0; + + String level = WxLevelConfigService.DEFAULT_LEVEL; + Long levelId = 0L; for(WxLevelConfig levelConfig: levelList) { - if (userVo.getScore() >= levelConfig.getPoints()) { - curLConfig = levelConfig; - } - } - if (curLConfig != null) { - userVo.setLevelId(curLConfig.getId()); - userVo.setLevelName(curLConfig.getLevel()); - curDiscountRateIndex = curLConfig.getDiscountEnable(); - if(curLConfig.getDiscountEnable() == 0) { // 未启用等级折扣 - userVo.setDiscountRate(0); // 折扣率为0 - userVo.setAmount(amount); - } else { - // 当前商户折扣率 - WxMerchant merchant = wxMerchantService.getById(bUser.getMerchantId()); - if (merchant == null){ - return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND); - } - if(curDiscountRateIndex == 1) { - curDiscountRate = merchant.getVipDiscountRate1(); - } else if(curDiscountRateIndex == 2) { - curDiscountRate = merchant.getVipDiscountRate2(); - } else if(curDiscountRateIndex == 3) { - curDiscountRate = merchant.getVipDiscountRate3(); - } - userVo.setDiscountRate(curDiscountRate); - userVo.setAmount(amount*curDiscountRate/10000); + if (user.getScore() >= levelConfig.getPoints()) { + if(levelConfig.getDiscountEnable().equals(EnumLevelConfigDiscountStatus.ENABLE.getCode())) + levelId = levelConfig.getId(); + level = levelConfig.getLevel(); } } - - - - + userVo.setLevelId(levelId); + userVo.setLevelName(level); + + WxLevelMerchant levelMerchant = new WxLevelMerchant(); + levelMerchant.setLevelId(levelId); + levelMerchant.setMerchantId(bUser.getMerchantId()); + List levelMerchantList = wxLevelConfigService.findListCVo(levelMerchant); + if (levelMerchantList.size() > 0) { + WxLevelMerchantCVo l = levelMerchantList.get(0); + userVo.setDiscountRate(l.getDiscount()); + userVo.setAmount(amount*l.getDiscount()/WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); + } else { + userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT); // 折扣率为0 + userVo.setAmount(amount); + } return new ResultData(userVo); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index 040198b89..5d9ad8264 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -44,10 +44,6 @@ public class WxMallController extends BaseController { @Autowired private WxLevelConfigService wxLevelConfigService; - @Autowired - private WxMerchantService wxMerchantService; - - @AuthIgnore @ApiOperation("商场图标") @GetMapping("/getAppIcon") @@ -116,16 +112,6 @@ public class WxMallController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", map); } - @ApiOperation("获取打折商户列表") - @GetMapping("/discountMerchantList") - public ResultData getMerchantId() { - WxCUser user = getUser(); - WxMerchant merchantQ = new WxMerchant(); - merchantQ.setTenantId(user.getTenantId()); - merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); - List list = wxMerchantService.getDisCountList(merchantQ); - return new ResultData(Result.SUCCESS, "查询成功", list); - } @AuthIgnore @ApiOperation("获取后端版本号") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index cf21dc834..c5120ef9f 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.enums.EnumAssignTagsTrigger; +import com.iformall.enums.EnumLevelConfigDiscountStatus; import com.iformall.enums.EnumScoreType; import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.service.*; @@ -411,9 +412,9 @@ public class WxUserGrantController extends BaseController { WxCUserVo userVo = new WxCUserVo(); org.springframework.beans.BeanUtils.copyProperties(user, userVo); if (userVo.getScore() == null || userVo.getScore() == 0) { - userVo.setLevelName("无"); + userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); } else { - userVo.setLevelName("无"); + userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); for(WxLevelConfig levelConfig: levelList) { if (userVo.getScore() >= levelConfig.getPoints()) { @@ -575,11 +576,12 @@ public class WxUserGrantController extends BaseController { List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); - String level = "无"; + String level = WxLevelConfigService.DEFAULT_LEVEL; Long levelId = 0L; for(WxLevelConfig levelConfig: levelList) { if (user.getScore() >= levelConfig.getPoints()) { - levelId = levelConfig.getId(); + if(levelConfig.getDiscountEnable().equals(EnumLevelConfigDiscountStatus.ENABLE.getCode())) + levelId = levelConfig.getId(); level = levelConfig.getLevel(); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 1f6b0673a..975a0f7bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -137,15 +137,6 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") private Long brand; - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") - private Integer vipDiscountRate1; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") - private Integer vipDiscountRate2; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") - private Integer vipDiscountRate3; - @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") private Integer type; @@ -369,29 +360,6 @@ public class WxMerchant implements Serializable { this.wxMerchantTax = wxMerchantTax; } - public Integer getVipDiscountRate1() { - return vipDiscountRate1; - } - - public void setVipDiscountRate1(Integer vipDiscountRate1) { - this.vipDiscountRate1 = vipDiscountRate1; - } - - public Integer getVipDiscountRate2() { - return vipDiscountRate2; - } - - public void setVipDiscountRate2(Integer vipDiscountRate2) { - this.vipDiscountRate2 = vipDiscountRate2; - } - - public Integer getVipDiscountRate3() { - return vipDiscountRate3; - } - - public void setVipDiscountRate3(Integer vipDiscountRate3) { - this.vipDiscountRate3 = vipDiscountRate3; - } public String getAccountParameter() { return accountParameter; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index c0d036d2a..8e28a5579 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -52,15 +52,6 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") - private Integer vipDiscountRate1; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") - private Integer vipDiscountRate2; - - @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") - private Integer vipDiscountRate3; - public String getBuildingName() {return buildingName; } public void setBuildingName(String _building) { @@ -134,29 +125,4 @@ public class WxMerchantVo { } - public Integer getVipDiscountRate1() { - return vipDiscountRate1; - } - - public void setVipDiscountRate1(Integer vipDiscountRate1) { - this.vipDiscountRate1 = vipDiscountRate1; - } - - public Integer getVipDiscountRate2() { - return vipDiscountRate2; - } - - public void setVipDiscountRate2(Integer vipDiscountRate2) { - this.vipDiscountRate2 = vipDiscountRate2; - } - - public Integer getVipDiscountRate3() { - return vipDiscountRate3; - } - - public void setVipDiscountRate3(Integer vipDiscountRate3) { - this.vipDiscountRate3 = vipDiscountRate3; - } - - } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumLevelConfigDiscountStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumLevelConfigDiscountStatus.java new file mode 100644 index 000000000..47dbff783 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumLevelConfigDiscountStatus.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumLevelConfigDiscountStatus { + + DISABLE(0, "停用"), + ENABLE(1, "启用"), + ; + + public static EnumLevelConfigDiscountStatus getEnum(Integer code) { + for (EnumLevelConfigDiscountStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumLevelConfigDiscountStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 1a53acbfa..6979d26b2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -9,13 +9,6 @@ public interface WxMerchantMapper extends CommonMapper { List findList(WxMerchant wxMerchant); - List findDiscountList(WxMerchant wxMerchant); - WxMerchantVo getMerchantByCode(HashMap params); - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index 9f25f6c0d..d0dd6d9db 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -10,7 +10,9 @@ import java.util.List; public interface WxLevelConfigService { - public final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; + + public final static int DEFAULT_MERCHANT_DISCOUNT = 100; + public final static String DEFAULT_LEVEL = "无"; /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 608d50114..fe94ba44c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -24,14 +24,6 @@ public interface WxMerchantService { */ PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize); - /** - * 根据实体查询分页列表 - * - * @param record - * @return - */ - List getDisCountList(WxMerchant record); - /** * 根据code查询 * 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 3b2acd84c..1663cd402 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; @Service public class WxLevelConfigServiceImpl implements WxLevelConfigService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - + private final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; @Autowired WxLevelConfigMapper wxLevelConfigMapper; @@ -42,7 +42,6 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { return page; } - public final static int DEFAULT_MERCHANT_DISCOUNT = 100; @Override public List listByMerchantId(Long merchantId, WxLevelConfig record) { @@ -120,14 +119,15 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { if(levelConfig.getId() == null) { levelConfig.setId(idWorker.nextId()); levelConfig.setCreateDate(new Date()); + levelConfig.setUpdateDate(new Date()); + } else { + levelConfig.setUpdateDate(new Date()); } levelConfig.setTenantId(tenantId); wxLevelConfigMapper.insertSelective(levelConfig); } } - public final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; - @Override public void batchUpdateCapabilities(String tenantId, List records) { records.stream() diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index f9f01e2f8..73394b54c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -103,11 +103,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { return pageInfo; } - @Override - public List getDisCountList(WxMerchant record) { - return wxMerchantMapper.findDiscountList(record); - } - @Override public WxMerchantVo getMerchantInfo(HashMap params) { return wxMerchantMapper.getMerchantByCode(params); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index f74a3af44..16d425b81 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -16,16 +16,13 @@ - - - `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`shop_type`,`brand`,`vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3`,`type` + `business_id`,`shop_type`,`brand`,`type` @@ -99,8 +96,7 @@ m.id, m.img_url,m.name,m.link_phone,m.status, s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name, - m.vip_discount_rate1, m.vip_discount_rate2, m.vip_discount_rate3 + mb.building_name,mf.floor_name @@ -116,29 +112,8 @@ - - - -