diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index e287e5eba..86f1819fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -257,15 +257,11 @@ public class MallUserInfoController extends BaseController { } private int checkUniqueName(String userName) { - MallUserInfo userQ = new MallUserInfo(); - userQ.setUsername(userName); - return userInfoService.cntUserList(userQ); + return userInfoService.cntByUserName(userName); } private int checkUniquePhone(String phone) { - MallUserInfo userQ = new MallUserInfo(); - userQ.setPhone(phone); - return userInfoService.cntUserList(userQ); + return userInfoService.cntByUserPhone(phone); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index 77661b2f1..56509492f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -5,7 +5,9 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; +import com.iformall.domain.po.WxSubBusiness; import com.iformall.service.WxBusinessService; +import com.iformall.service.WxSubBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,6 +29,9 @@ public class WxBusinessController extends BaseController { @Autowired private WxBusinessService wxBusinessService; + @Autowired + private WxSubBusinessService wxSubBusinessService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -49,41 +54,13 @@ public class WxBusinessController extends BaseController { return new ResultData(busList); } - @ApiOperation("新增接口") - @PostMapping("add") - @SystemControllerLog(description = "业态-新增") - public ResultData add(@RequestBody WxBusiness wxBusiness) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::add"); - //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - @SystemControllerLog(description = "业态-更新") - public ResultData update(@RequestBody WxBusiness wxBusiness) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::update"); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "业态-删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::delete"); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "业态-查询") - public ResultData findById(Integer id) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxBusinessService.getById(id)); + @ApiOperation("子业态表接口") + @GetMapping("listSub") + @SystemControllerLog(description = "子业态") + public ResultData listSub(@ModelAttribute WxSubBusiness wxSubBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); + final List busList = wxSubBusinessService.findList(wxSubBusiness); + return new ResultData(busList); } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 1359fe8ac..78109fa81 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -36,6 +36,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_business".equals(tableName)) { return true; } + if ("wx_sub_business".equals(tableName)) { + return true; + } if ("wx_coupon_type".equals(tableName)) { return true; } @@ -76,6 +79,8 @@ public class TenantInfoImpl implements TenantInfo { public boolean doMappedStatementFIlter(MappedStatement ms) { if ("com.iformall.mapper.MallUserInfoMapper.selectByUserName".equals(ms.getId())) return true; + if ("com.iformall.mapper.MallUserInfoMapper.cntByUserName".equals(ms.getId())) + return true; if ("com.iformall.mapper.WxCouponActionLogMapper.getCountByUserAndCoupon".equals(ms.getId())) return true; return false; diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 4011c29c5..c35cb3431 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -22,7 +22,7 @@ spring: poolPreparedStatements: true maxOpenPreparedStatements: 20 connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" - #jackson: + #jackson: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: @@ -112,7 +112,7 @@ jasypt: fm: exception: false deploy: 1 - open: false + open: true ueditor: config: config.json diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql b/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql new file mode 100644 index 000000000..8e44b1dc0 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904111308__CHANGE_C_USER_INFOS.sql @@ -0,0 +1,4 @@ +ALTER TABLE `wx_c_user` +CHANGE COLUMN `mp_subscribe_scene` `mp_subscribe_scene` VARCHAR(30) NULL, +CHANGE COLUMN `subs_subscribe_scene` `subs_subscribe_scene` VARCHAR(30) NULL, +CHANGE COLUMN `open_id` `open_id` VARCHAR(28) NULL COMMENT '微信openId'; \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 57b7e3746..bd151ee2e 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -86,7 +86,7 @@ wechat: fm: exception: false deploy: 1 - open: false + open: true logging: level: diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index af8fb4fb7..f7b7ad3cf 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -40,13 +40,6 @@ public class WxBusinessController extends BaseController { return new ResultData(page); } - //临时兼容的代码,过度更改接口名 - @ApiOperation("业态全列表接口") - @GetMapping("allist") - public ResultData allist(@ModelAttribute WxBusiness wxBusiness) { - final List busList = wxBusinessService.findListAll(); - return new ResultData(busList); - } @ApiOperation("业态全列表接口") @GetMapping("listAll") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 9fbc7cadc..a6a544c3f 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -391,7 +391,7 @@ public class WxUserGrantController extends BaseController { * 检查用户状态 * @return */ - @GetMapping("/checkUserStatus") + @RequestMapping("/checkUserStatus") @ApiOperation(value = "判断是否是老用户", notes="") public ResultData checkUserStatus() { Map resultMap = new HashMap(); @@ -409,7 +409,7 @@ public class WxUserGrantController extends BaseController { * 检查用户状态 * @return */ - @GetMapping("/checkPhoneStatus") + @RequestMapping("/checkPhoneStatus") @ApiOperation(value = "判断是否是老用户", notes="") public ResultData checkPhoneStatus() { Map resultMap = new HashMap(); @@ -591,7 +591,7 @@ public class WxUserGrantController extends BaseController { * 获取用户折扣率 * @return */ - @GetMapping("/getDiscountInfo") + @RequestMapping("/getDiscountInfo") @ApiOperation(value = "获取用户折扣率", notes="") public ResultData getDiscountInfo() { diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index ec10f5a5b..bb2b7ded5 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -105,7 +105,7 @@ jasypt: fm: exception: false deploy: 1 - open: false + open: true logging: level: diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 604233da8..5601bf51d 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -88,7 +88,7 @@ jasypt: fm: exception: false deploy: 1 - open: false + open: true logging: level: diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java index ef736ae5f..7c86cd9f2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java @@ -9,6 +9,7 @@ public class WxCouponMerchantDto implements Serializable { Long merchantId; String parameter; Integer business; + Integer subBusiness; public Long getMerchantId() { return merchantId; @@ -33,4 +34,12 @@ public class WxCouponMerchantDto implements Serializable { public void setBusiness(Integer business) { this.business = business; } + + public Integer getSubBusiness() { + return subBusiness; + } + + public void setSubBusiness(Integer subBusiness) { + this.subBusiness = subBusiness; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index d86041946..e2df39f3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -21,6 +21,9 @@ public class WxCoupon implements Serializable { @Transient protected List ids; + @Transient + protected List types; + @Transient protected List notinTypes; @Transient @@ -49,6 +52,14 @@ public class WxCoupon implements Serializable { this.ids = ids; } + public List getTypes() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + @Transient private String salePriceStr; @@ -70,8 +81,8 @@ public class WxCoupon implements Serializable { /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ - @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51积分停车券,100.消费卡)",name="type") + /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") private Integer type; /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 3cad5f49b..f389840d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -27,10 +27,9 @@ public class WxScoreRules implements Serializable { private static final long serialVersionUID = 1L; @Transient - private static final String defaultRules = + private static final String scoreDefaultRules = "[" + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":10 ,\"desc\":\"每日登陆\"}," + - // "{\"id\":2,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + "{\"id\":2,\"childs\":[" + " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + @@ -50,6 +49,29 @@ public class WxScoreRules implements Serializable { "{\"id\":7,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"编辑个人信息\"}" + "]"; + @Transient + private static final String creditDefaultRules = + "[" + + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + + "{\"id\":2,\"childs\":[" + + " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":3,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":5,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":7,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":8,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":9,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":10,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}" + + "]}," + + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + + "{\"id\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"连接WIFI1次\"}," + + "{\"id\":5,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权个人信息\"}," + + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + + "{\"id\":7,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + + "]"; + @Transient public static final String ID = "id"; @Transient @@ -114,9 +136,12 @@ public class WxScoreRules implements Serializable { tenantId = _tenantId; } + public static String getScoreDefaultRules() { + return scoreDefaultRules; + } - public static String getDefaultRules() { - return defaultRules; + public static String getCreditDefaultRules() { + return creditDefaultRules; } public void setRules(String rules) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java index f40d727c4..1e2b07849 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallUserInfoMapper.java @@ -28,7 +28,7 @@ public interface MallUserInfoMapper extends CommonMapper { Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); - long cntByUserName(Map params); + int cntByUserName(Map params); List selectUsersByPhone(@Param("phone") String phone); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 25b866896..158fb06e9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -34,7 +34,9 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractList(Map params); + List getRentContractListByShop(Map params); + + List getRentContractListByPoint(Map params); void updateApplyStatus(WxPropertyContract wxPropertyContract); diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java index 577ff348f..f4bec4840 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java @@ -25,7 +25,7 @@ public interface MallUserInfoService { * @return */ int cntUserList(MallUserInfo record); - + /** * 根据Id获得实体 * @@ -52,7 +52,13 @@ public interface MallUserInfoService { * 查询用户名总数,用于校验用户名是否重复 * @param username */ - long cntByUserName(String username); + int cntByUserName(String username); + + /** + * 查询手机号,用于校验手机号是否重复 + * @param phone + */ + int cntByUserPhone(String phone); /** * 根据用户名查询用户对象 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 6bab4c279..5cf076d5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -139,10 +139,17 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { } @Override - public long cntByUserName(String username) { - MallUserInfo userInfo = new MallUserInfo(); - userInfo.setUsername(username); - return PageHelper.count(() -> mallUserInfoMapper.select(userInfo)); + public int cntByUserName(String username) { + Map params = new HashMap<>(); + params.put("username", username); + return mallUserInfoMapper.cntByUserName(params); + } + + @Override + public int cntByUserPhone(String phone) { + Map params = new HashMap<>(); + params.put("phone", phone); + return mallUserInfoMapper.cntByUserName(params); } @Override 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 e9bb25868..ff96353fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -210,6 +210,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setTenantId(wxCoupon.getTenantId()); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); + wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); wxCouponChannel.setSubTargetId(record.getId()); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 669b79328..61175c6f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -214,6 +214,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannel.setTargetAd(channelId); wxCouponChannel.setTenantId(tanantId); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); + wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); saveOrUpdate(wxCouponChannel); return null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 059520007..86e6d567c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -156,7 +156,15 @@ public class WxCouponServiceImpl implements WxCouponService { return merchantParam.getString("parameter"); } private Integer parseBusiness(JSONObject merchantParam){ - return Integer.valueOf(merchantParam.getString("businessId")); + String businessIdStr = merchantParam.getString("businessId"); + return Integer.valueOf(businessIdStr); + + } + private Integer parseSubBusiness(JSONObject merchantParam){ + String subBusinessIdStr = merchantParam.getString("subBusinessId"); + if (subBusinessIdStr != null) + return Integer.valueOf(subBusinessIdStr); + return null; } private WxCouponMerchantDto parseMerchantParam(JSONObject merchantParam){ @@ -165,6 +173,7 @@ public class WxCouponServiceImpl implements WxCouponService { wxCouponMerchantDto.setMerchantId(parseMerchantId(merchantParam)); wxCouponMerchantDto.setParameter(parseParameter(merchantParam)); wxCouponMerchantDto.setBusiness(parseBusiness(merchantParam)); + wxCouponMerchantDto.setSubBusiness(parseSubBusiness(merchantParam)); }catch (Exception e) { throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } @@ -204,7 +213,7 @@ public class WxCouponServiceImpl implements WxCouponService { } final IdWorker idWorker = IdWorker.get(); - + List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); if (record.getId() == null) { // check 卡券补贴设置 @@ -232,9 +241,9 @@ public class WxCouponServiceImpl implements WxCouponService { } record.setId(idWorker.nextId()); - List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); - if (merchantParamList != null) { - List businessList= new ArrayList<>(); + + if (merchantParamList != null && merchantParamList.size() > 0) { + List wxCouponMerchantDtoList = new ArrayList<>(); merchantParamList.forEach(merchantParam -> { WxCouponMerchant cm = new WxCouponMerchant(); WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); @@ -245,13 +254,17 @@ public class WxCouponServiceImpl implements WxCouponService { cm.setCreateDate(new Date()); cm.setUpdateDate(new Date()); cm.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); - businessList.add(wxCouponMerchantDto.getBusiness()); + wxCouponMerchantDtoList.add(wxCouponMerchantDto); wxCouponMerchantMapper.insertSelective(cm); }); - if (businessList.stream().distinct().count() > 1) { + if (wxCouponMerchantDtoList.stream() + .mapToInt(WxCouponMerchantDto::getBusiness).distinct().count() > 1) { record.setBusiness(EnumBusiness.BUSINESS_ID6.getCode()); + } else if (wxCouponMerchantDtoList.size() > 1){ + record.setBusiness(wxCouponMerchantDtoList.get(0).getBusiness()); } else { - record.setBusiness(businessList.get(0)); + record.setBusiness(wxCouponMerchantDtoList.get(0).getBusiness()); + record.setSubBusiness(wxCouponMerchantDtoList.get(0).getSubBusiness()); } } else{ @@ -263,13 +276,11 @@ public class WxCouponServiceImpl implements WxCouponService { wxCouponMapper.insertSelective(record); } else { - if (record.getMerchantParams() != null) { - List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); - + if (merchantParamList != null && merchantParamList.size() > 0) { WxCouponMerchant cmParam = new WxCouponMerchant(); cmParam.setProductId(record.getId()); List oldList = wxCouponMerchantMapper.findList(cmParam); - List businessList= new ArrayList<>(); + List wxCouponMerchantDtoList = new ArrayList<>(); merchantParamList.stream().forEach(merchantParam -> { WxCouponMerchant cm = new WxCouponMerchant(); WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); @@ -289,7 +300,7 @@ public class WxCouponServiceImpl implements WxCouponService { cm.setUpdateDate(new Date()); wxCouponMerchantMapper.insertSelective(cm); } - businessList.add(Integer.valueOf(wxCouponMerchantDto.getBusiness())); + wxCouponMerchantDtoList.add(wxCouponMerchantDto); oldList.removeIf( old->old.getProductId().equals(record.getId()) && old.getMerchantId().equals(wxCouponMerchantDto.getMerchantId())); @@ -301,10 +312,14 @@ public class WxCouponServiceImpl implements WxCouponService { wxCouponMerchantMapper.updateByPrimaryKeySelective(old); }); - if (businessList.stream().distinct().count() > 1) { + if (wxCouponMerchantDtoList.stream() + .mapToInt(WxCouponMerchantDto::getBusiness).distinct().count() > 1) { record.setBusiness(EnumBusiness.BUSINESS_ID6.getCode()); + } else if (wxCouponMerchantDtoList.size() > 1){ + record.setBusiness(wxCouponMerchantDtoList.get(0).getBusiness()); } else { - record.setBusiness(businessList.get(0)); + record.setBusiness(wxCouponMerchantDtoList.get(0).getBusiness()); + record.setSubBusiness(wxCouponMerchantDtoList.get(0).getSubBusiness()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 93e448dcd..36805fe57 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -285,6 +285,7 @@ public class WxGameServiceImpl implements WxGameService { wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); wxCouponChannel.setTenantId(wxCoupon.getTenantId()); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); + wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); wxCouponChannel.setSubTargetId(record.getId()); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 2a7281e24..a701cd2f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -745,7 +745,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Map params = new HashMap<>(); params.put("tenantId", record.getTenantId()); params.put("rentShopType", record.getRentShopType()); - List contractList = wxPropertyContractMapper.getRentContractList(params); + List contractList; + if (record.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { + contractList = wxPropertyContractMapper.getRentContractListByShop(params); + } else { + contractList = wxPropertyContractMapper.getRentContractListByPoint(params); + } return contractList; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index aacb927b2..4e02b9396 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -27,9 +27,9 @@ import java.util.List; public class WxScoreRulesServiceImpl implements WxScoreRulesService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private String keyPrev = "setting:scorerules:"; + private String keyPrev = "setting:scorerules1:"; - private String creditKeyPrev = "setting:creditrules:"; + private String creditKeyPrev = "setting:creditrules1:"; @Autowired WxScoreRulesMapper wxScoreRulesMapper; @@ -54,7 +54,6 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); - wScoreRules.setRules(getScoreRulesNew(wScoreRules.getRules())); logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了成长值设置 >> " + wScoreRules.toString()); return wScoreRules; } @@ -65,13 +64,13 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); - scoreRules.setRules(getScoreRulesNew(scoreRules.getRules())); + scoreRules.setRules(getScoreRulesNew(scoreRules.getRules(),EnumScoreRules.SCORE)); } else { // 如果成长值规则不存在,启用默认值 final IdWorker idWorker = IdWorker.get(); scoreRules.setId(idWorker.nextId()); - scoreRules.setRules(WxScoreRules.getDefaultRules()); + scoreRules.setRules(WxScoreRules.getScoreDefaultRules()); wxScoreRulesMapper.insertSelective(scoreRules); } @@ -83,10 +82,11 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } //当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 - private String getScoreRulesNew(String scoreRules){ + private String getScoreRulesNew(String scoreRules,EnumScoreRules enumScoreRules){ //getJSONObject(1) 为EnumScoreType.CONSUMPTION(2, "消费")的下标值 JSONArray jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(1).getJSONArray("childs"); - JSONArray jsonArrayDefault = JSONArray.parseArray(WxScoreRules.getDefaultRules()).getJSONObject(1).getJSONArray("childs"); + String defaultRules = enumScoreRules.equals(EnumScoreRules.SCORE) ? WxScoreRules.getScoreDefaultRules() : WxScoreRules.getCreditDefaultRules(); + JSONArray jsonArrayDefault = JSONArray.parseArray(defaultRules).getJSONObject(1).getJSONArray("childs"); if (jsonArrayOld.size() < jsonArrayDefault.size()) { JSONArray childsJsonArray = new JSONArray(); JSONObject otherJSONObject = new JSONObject(); @@ -129,7 +129,6 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); - wScoreRules.setRules(getScoreRulesNew(wScoreRules.getRules())); logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了积分值设置 >> " + wScoreRules.toString()); return wScoreRules; } @@ -140,12 +139,12 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); - scoreRules.setRules(getScoreRulesNew(scoreRules.getRules())); + scoreRules.setRules(getScoreRulesNew(scoreRules.getRules(),EnumScoreRules.CREDIT)); } else { // 如果积分规则不存在,启用默认值 final IdWorker idWorker = IdWorker.get(); scoreRules.setId(idWorker.nextId()); - scoreRules.setRules(WxScoreRules.getDefaultRules()); + scoreRules.setRules(WxScoreRules.getCreditDefaultRules()); wxScoreRulesMapper.insertSelective(scoreRules); } diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index ca6dfbbbb..b71f16523 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -196,8 +196,8 @@ AND p.permission = #{permission} - + select count(*) from mall_user_info where status = 1 and username=#{username} diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4f51a0539..9d21962e4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -266,7 +266,7 @@ and c.`tenant_id` = #{tenantId} - + and c.`type` < 7 @@ -393,6 +393,13 @@ #{idItem} + + + and c.type in + + #{typesItem} + + order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 2b00b336b..af370fdb4 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -175,15 +175,26 @@ )s) and merchant_id is null and tenant_id=#{tenantId} - + select rc.* from wx_rent_contract rc where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId} and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(5,6,7) and tenant_id=#{tenantId} ) pc) and rent_shop_type = #{rentShopType} - + + + + update wx_property_contract set apply_status=#{applyStatus} ,business_type=#{businessType} diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index a1f4498f5..4e2a1354c 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -102,7 +102,7 @@ jasypt: fm: exception: false deploy: 1 - open: false + open: true logging: level: