From ec116db56df5f2c71d7a3b896960bbf4468a534d Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 19 Jan 2022 11:04:33 +0800 Subject: [PATCH 1/2] fix wxMerchant --- .../com/iformall/mapper/WxMerchantMapper.java | 2 - .../iformall/service/WxMerchantService.java | 6 -- .../service/impl/WxMerchantServiceImpl.java | 37 -------- .../resources/mapper/WxMerchantMapper.xml | 23 ----- .../controller/WxMerchantController.java | 85 ------------------- 5 files changed, 153 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 49e3ace63..7713d3044 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -56,8 +56,6 @@ public interface WxMerchantMapper extends CommonMapper { WxMerchant getMerchantByEncode(@Param("encode")String encode); - List findFollowList(WxMerchant record); - int recordedAmount(WxMerchant record); List> findMerchantByShop(@Param("shopId")Long shopId); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 8d3aa9d8a..96aba3c73 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -166,12 +166,6 @@ 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); - ResultData damark(WxMerchant wxMerchant, TenantEntity tenantInfo); ResultData downmark(WxMerchant wxMerchant); 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 242487f2e..4d95037a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1077,43 +1077,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantShopMapper.findShopIds(merchantIds); } - @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)); - } @Override public ResultData damark(WxMerchant wxMerchant, TenantEntity tenantInfo) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index b9651a4b6..128be99a8 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -215,29 +215,6 @@ - - - select - from wx_coupon_channel cc - left join wx_coupon c on cc.coupon_id = c.id - left join wx_coupon_merchant cm on c.id = cm.product_id and cm.status = 0 - - - - + select + cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time,cc.tenant_id,cc.parent_tenant_id,cc.qr_code,cc.tt_qr_code + from wx_coupon_channel cc where cc.id = #{id} and cc.tenant_id = #{tenantId} - - cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, - c.tenant_id,c.parent_tenant_id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price, - c.use_limit_rule,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, - c.valid_days,c.detail,c.price,c.tail_price,c.orig_price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, - c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,c.content_type, - cc.qr_code,cc.tt_qr_code - - - - cc.id,cc.coupon_id,c.remain_inventory,c.status - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + select cc.id,cc.coupon_id from wx_coupon_channel cc - left join wx_coupon c on cc.coupon_id = c.id where cc.id = #{id} and cc.tenant_id = #{tenantId} - - + + + + +