From 40c739ef5c6d8f94e89eb96770838804539fcea0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 29 May 2021 12:12:44 +0800 Subject: [PATCH] tt --- .../com/iformall/domain/po/WxMerchant.java | 3 + .../com/iformall/domain/po/tt/TtCoupon.java | 3 + .../domain/po/tt/TtUserCollectFollow.java | 3 + .../com/iformall/enums/EnumTemplateType.java | 1 + .../com/iformall/mapper/TtCouponMapper.java | 1 + .../com/iformall/mapper/WxMerchantMapper.java | 2 + .../iformall/service/WxMerchantService.java | 7 ++ .../service/impl/WxMerchantServiceImpl.java | 42 +++++++++ .../impl/WxTemplateMsgServiceImpl.java | 13 +++ .../iformall/service/tt/TtCouponService.java | 7 +- .../service/tt/impl/TtCouponServiceImpl.java | 32 +------ .../main/resources/mapper/TtCouponMapper.xml | 26 ++++++ .../resources/mapper/WxMerchantMapper.xml | 87 ++++++++++++------- .../controller/TtCouponController.java | 76 ++++------------ .../controller/WxMerchantController.java | 85 ++++++++++++++++++ 15 files changed, 262 insertions(+), 126 deletions(-) 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 0438e1427..e9f5d1b7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -46,6 +46,9 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private Long rentContractId; + @TableField(exist = false) + private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value="商户编码",name="encode") @Excel(name="商户编码",width = 20,orderNum = "1") private String encode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java index 3bae66318..e7d007ab7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java @@ -23,6 +23,9 @@ public class TtCoupon extends TenantEntity { protected Long id; + @TableField(exist = false) + private Long cUserId; + @TableField(exist = false) protected List types; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java index c6f7ffd1e..fbbf5469b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java @@ -31,4 +31,7 @@ public class TtUserCollectFollow extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; + @TableField(exist = false) + private String name; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java index 3e5236d7a..c92846728 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java @@ -13,6 +13,7 @@ public enum EnumTemplateType { ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序 LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序 + CREDIT_UPD_REMIND(6, "积分变更提醒","310"), // 小程序 AUDIT_MESSAGE(101, "公众号审核结果通知",""), // 公众号 VERIFY_RESULT(102, "公众号卡券核销通知",""), // 公众号 diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtCouponMapper.java index 9e45d804b..3965339b3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtCouponMapper.java @@ -63,4 +63,5 @@ public interface TtCouponMapper extends CommonMapper { */ int addPopularity(@Param("id")Long id,@Param("popularity")Integer popularity); + List findCollectList(TtCoupon record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 9d740002f..7db44f2f4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -53,4 +53,6 @@ public interface WxMerchantMapper extends CommonMapper { void reSetCashCount(WxMerchant record); WxMerchant getMerchantByEncode(@Param("encode")String encode); + + List findFollowList(WxMerchant record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index ff75194a9..93e22be13 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.base.TenantEntity; @@ -161,4 +162,10 @@ public interface WxMerchantService { List getMerchantShopIds(Long merchantId); + + void followMerchant(TenantEntity tenantEntity, Long memberId, Long id); + void cancelFollow(Long memberId, Long id); + int getfollow(Long memberId, Long id); + PageInfo followListAsPage(WxMerchant record, Integer pageNum, Integer pageSize); + } 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 03fd50c0d..980bd2e20 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.tt.TtUserFollow; import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -102,6 +103,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxPropertyContractService wxPropertyContractService; + @Autowired + TtUserFollowMapper ttUserFollowMapper; + @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); @@ -938,4 +942,42 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantShopMapper.findShopIds(merchantId); } + @Override + public void followMerchant(TenantEntity tenantEntity, Long memberId, Long id) { + final IdWorker idWorker = IdWorker.get(); + TtUserFollow userFollow = new TtUserFollow(); + userFollow.setId(idWorker.nextId()); + userFollow.updateTenantInfo(tenantEntity); + userFollow.setUserId(memberId); + userFollow.setMerchernId(id); + userFollow.setCreateDate(new Date()); + userFollow.setUpdateDate(new Date()); + try { + ttUserFollowMapper.insert(userFollow); + } catch (Exception e) { +// e.printStackTrace(); + } + } + + @Override + public void cancelFollow(Long memberId, Long id) { + TtUserFollow userFollow = new TtUserFollow(); + userFollow.setUserId(memberId); + userFollow.setMerchernId(id); + int delete = ttUserFollowMapper.delete(new QueryWrapper<>(userFollow)); + } + + @Override + public int getfollow(Long memberId, Long id) { + TtUserFollow userFollow = new TtUserFollow(); + userFollow.setUserId(memberId); + userFollow.setMerchernId(id); + return ttUserFollowMapper.selectCount(new QueryWrapper<>(userFollow)); + } + + @Override + public PageInfo followListAsPage(WxMerchant record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findFollowList(record)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index 3ca737ec0..f23c3471c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -57,6 +57,10 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { wxTemplateMsg.setType(EnumTemplateType.LIVE_REMIND.getCode()); wxTemplateMsg.setCustomParam("{\"index\": [\"thing1\", \"date3\", \"thing4\", \"thing5\"], \"emphasis\": \"\"}"); wxTemplateMsgMapper.insert(wxTemplateMsg); + wxTemplateMsg.setId(null); + wxTemplateMsg.setType(EnumTemplateType.CREDIT_UPD_REMIND.getCode()); + wxTemplateMsg.setCustomParam("{\"index\": [\"character_string1\", \"character_string2\", \"time4\", \"thing3\"], \"emphasis\": \"\"}"); + wxTemplateMsgMapper.insert(wxTemplateMsg); } @Override @@ -131,6 +135,15 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { } catch (WxErrorException e) { return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); } + }else if(byId.getType() == EnumTemplateType.CREDIT_UPD_REMIND.getCode()){ + try { + s = wxMaService.getSubscribeService().addTemplate(EnumTemplateType.CREDIT_UPD_REMIND.getTid(), + Lists.newArrayList(1, 2, 4, 3),EnumTemplateType.CREDIT_UPD_REMIND.getMessage()); + } catch (WxErrorException e) { + return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); + } + }else{ + return new ResultData(ErrorCode.TEMPLATE_NOT_FOUND); } if(StringUtils.isBlank(s)){ return new ResultData(ErrorCode.TEMPLATE_ADD_ERROR); diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java index e15013bb3..b5259745b 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java @@ -1,6 +1,7 @@ package com.iformall.service.tt; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.tt.TtCoupon; @@ -50,11 +51,8 @@ public interface TtCouponService { void collectCoupon(TenantEntity tenantEntity,Long memberId, Long id); void cancelCollect(Long memberId, Long id); int getcollect(Long memberId, Long id); + PageInfo collectListAsPage(TtCoupon record, Integer pageNum, Integer pageSize); - @Async - void followMerchant(TenantEntity tenantEntity, Long memberId, Long id); - void cancelFollow(Long memberId, Long id); - int getfollow(Long memberId, Long id); ResultData auditPass(Long id); @@ -64,4 +62,5 @@ public interface TtCouponService { int addSeeCount(Long id); int addSellCount(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index 02ec1181d..1abf10710 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -225,36 +225,8 @@ public class TtCouponServiceImpl implements TtCouponService { } @Override - public void followMerchant(TenantEntity tenantEntity, Long memberId, Long id) { - final IdWorker idWorker = IdWorker.get(); - TtUserFollow userFollow = new TtUserFollow(); - userFollow.setId(idWorker.nextId()); - userFollow.updateTenantInfo(tenantEntity); - userFollow.setUserId(memberId); - userFollow.setMerchernId(id); - userFollow.setCreateDate(new Date()); - userFollow.setUpdateDate(new Date()); - try { - ttUserFollowMapper.insert(userFollow); - } catch (Exception e) { -// e.printStackTrace(); - } - } - - @Override - public void cancelFollow(Long memberId, Long id) { - TtUserFollow userFollow = new TtUserFollow(); - userFollow.setUserId(memberId); - userFollow.setMerchernId(id); - int delete = ttUserFollowMapper.delete(new QueryWrapper<>(userFollow)); - } - - @Override - public int getfollow(Long memberId, Long id) { - TtUserFollow userFollow = new TtUserFollow(); - userFollow.setUserId(memberId); - userFollow.setMerchernId(id); - return ttUserFollowMapper.selectCount(new QueryWrapper<>(userFollow)); + public PageInfo collectListAsPage(TtCoupon record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> ttCouponMapper.findCollectList(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml index bfd92f94c..e90d06d3e 100644 --- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml @@ -139,6 +139,32 @@ + + + + select - from wx_merchant where encode = #{encode} + from wx_merchant m where m.encode = #{encode} diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java index 730ada181..84142ab48 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java @@ -153,74 +153,30 @@ public class TtCouponController extends BaseController { return new ResultData(); } - @ApiOperation("取消收藏") - @GetMapping("/cancelCollect") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData cancelCollect(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] TtCouponController::collectCoupon"); - if (id == null) { - return new ResultData(ResultData.ERROR, "缺少id"); - } - Long memberId; - try { - memberId = getMemberId(); - } catch (MallinkException e) { - return new ResultData(e.getErrorCode(), e.getMessage()); - } - ttCouponService.cancelCollect(memberId,id); - return new ResultData(); - } - - @ApiOperation("是否关注") - @GetMapping("/isfollow") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData isfollow(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] TtCouponController::isfollow"); - if (id == null) { - return new ResultData(ResultData.ERROR, "缺少id"); - } - Long memberId; - try { - memberId = getMemberId(); - } catch (MallinkException e) { - return new ResultData(e.getErrorCode(), e.getMessage()); - } - int count = ttCouponService.getfollow(memberId,id); - if(count > 0){ - return new ResultData(true); - }else{ - return new ResultData(false); - } - - } - - @ApiOperation("关注") - @GetMapping("/followMerchant") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData followMerchant(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] TtCouponController::followMerchant"); - if (id == null) { - return new ResultData(ResultData.ERROR, "缺少id"); - } - WxMerchant byId = wxMerchantService.getById(id); - if(byId == null){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"找不到数据"); - } + @ApiOperation("分页收藏列表接口") + @GetMapping("collectList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData collectList(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] TtCouponController::collectList"); + if (record == null) record = new TtCoupon(); Long memberId; try { memberId = getMemberId(); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } - ttCouponService.followMerchant(getTenantInfo(),memberId,byId.getId()); - return new ResultData(); + record.setCUserId(memberId); + record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); + return new ResultData(ttCouponService.collectListAsPage(record, pageNum, pageSize)); } - @ApiOperation("取消关注") - @GetMapping("/cancelFollow") + @ApiOperation("取消收藏") + @GetMapping("/cancelCollect") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData cancelFollow(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] TtCouponController::cancelFollow"); + public ResultData cancelCollect(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] TtCouponController::collectCoupon"); if (id == null) { return new ResultData(ResultData.ERROR, "缺少id"); } @@ -230,7 +186,7 @@ public class TtCouponController extends BaseController { } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } - ttCouponService.cancelFollow(memberId,id); + ttCouponService.cancelCollect(memberId,id); return new ResultData(); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index fe22e3453..700589d98 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -5,9 +5,11 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.tt.TtCoupon; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantPublic; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.enums.EnumTtCouponStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; @@ -84,5 +86,88 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchant); } + @ApiOperation("是否关注") + @GetMapping("/isfollow") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData isfollow(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::isfollow"); + if (id == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } + int count = wxMerchantService.getfollow(memberId,id); + if(count > 0){ + return new ResultData(true); + }else{ + return new ResultData(false); + } + + } + + @ApiOperation("关注") + @GetMapping("/followMerchant") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData followMerchant(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::followMerchant"); + if (id == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + WxMerchant byId = wxMerchantService.getById(id); + if(byId == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"找不到数据"); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } + wxMerchantService.followMerchant(getTenantInfo(),memberId,byId.getId()); + return new ResultData(); + } + + @ApiOperation("分页关注列表接口") + @GetMapping("collectList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData followList(@ModelAttribute WxMerchant record, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::followList"); + if (record == null) record = new WxMerchant(); + Long memberId; + try { + memberId = getMemberId(); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } + record.setCUserId(memberId); + record.setStatus(EnumMerchantStatus.VALID.getCode()); + record.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); + return new ResultData(wxMerchantService.followListAsPage(record, pageNum, pageSize)); + } + + @ApiOperation("取消关注") + @GetMapping("/cancelFollow") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData cancelFollow(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] TtCouponController::cancelFollow"); + if (id == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(), e.getMessage()); + } + wxMerchantService.cancelFollow(memberId,id); + return new ResultData(); + } + }