From bf6c2c45cf29f930d63ccbde8bf5817001ad2203 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 11 Jan 2022 14:39:15 +0800 Subject: [PATCH] fix couponorder export --- .../com/iformall/mapper/WxCUserBasicInfoMapper.java | 2 +- .../main/java/com/iformall/mapper/WxCouponMapper.java | 2 +- .../com/iformall/mapper/WxMerchantBUserMapper.java | 2 +- .../com/iformall/service/WxCUserBasicInfoService.java | 2 +- .../service/impl/WxCUserBasicInfoServiceImpl.java | 4 ++-- .../service/impl/WxCouponOrderServiceImpl.java | 6 +++--- .../main/resources/mapper/WxCUserBasicInfoMapper.xml | 10 ++++++++-- .../src/main/resources/mapper/WxCouponMapper.xml | 5 ++--- .../main/resources/mapper/WxCouponMerchantMapper.xml | 4 ++-- .../main/resources/mapper/WxMerchantBUserMapper.xml | 10 ++++++++-- 10 files changed, 29 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index cf0f42237..e49299dcf 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -22,7 +22,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findList(WxCUserBasicInfo wxCUserBasicInfo); List findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo); - List findListPhoneAndName(WxCUserBasicInfo wxCUserBasicInfo); + List findListPhoneAndNameByIds(WxCUserBasicInfo wxCUserBasicInfo); WxCUserBasicInfo selectById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index df238ddaf..98c6aa08e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -16,7 +16,7 @@ public interface WxCouponMapper extends CommonMapper { List findList(WxCoupon wxCoupon); - List findSimpleList(WxCoupon wxCoupon); + List findTenantSimpleList(WxCoupon wxCoupon); List findIdList(WxCoupon wxCoupon); List findCouponList(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java index 0ab899346..c57e19775 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java @@ -11,7 +11,7 @@ public interface WxMerchantBUserMapper extends CommonMapper findIdList(WxMerchantBUser wxMerchantBUser); - List findMerchantIdList(WxMerchantBUser wxMerchantBUser); + List findMerchantIdListByIds(WxMerchantBUser wxMerchantBUser); List findSelMerchantList(WxMerchantBUser wxMerchantBUser); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index d778dcfcc..04913ca7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -45,7 +45,7 @@ public interface WxCUserBasicInfoService { PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize); PageInfo listAsPage(TenantEntity tenantInfo, WxCUserBasicInfo wxCUserBasicInfo, Integer pageIndex, Integer pageSize); - List listPhoneAndName(WxCUserBasicInfo record); + List listPhoneAndNameByIds(WxCUserBasicInfo record); /** * 根据实体查询列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 40923612f..c13bba856 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -587,8 +587,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public List listPhoneAndName(WxCUserBasicInfo record) { - return wxCUserBasicInfoMapper.findListPhoneAndName(record); + public List listPhoneAndNameByIds(WxCUserBasicInfo record) { + return wxCUserBasicInfoMapper.findListPhoneAndNameByIds(record); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 3b55f042d..01868646c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -534,7 +534,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.info(">>>>>>>>>>>>>>>>>>>>>> query merchant :"+(times2-times1)); WxCoupon couponQ = new WxCoupon(); couponQ.updateTenantInfo(tenantEntity); - List couponList = wxCouponMapper.findSimpleList(couponQ); + List couponList = wxCouponMapper.findTenantSimpleList(couponQ); Map couponMap = new HashMap(); if (null != couponList) { for (int i = 0 ; i < couponList.size() ; i ++) { @@ -582,7 +582,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo(); cUserBasicInfoQ.setIds(cUserIdList); cUserBasicInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId());; - List cuserList = wxCUserBasicInfoService.listPhoneAndName(cUserBasicInfoQ); + List cuserList = wxCUserBasicInfoService.listPhoneAndNameByIds(cUserBasicInfoQ); if (null != cuserList) { for (int i = 0 ; i < cuserList.size() ; i++) { WxCUserBasicInfo cbi = cuserList.get(i); @@ -596,7 +596,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); merchantBUserQ.setIds(bUserIdList); merchantBUserQ.updateTenantInfo(tenantEntity); - List busrlist = wxMerchantBUserMapper.findMerchantIdList(merchantBUserQ); + List busrlist = wxMerchantBUserMapper.findMerchantIdListByIds(merchantBUserQ); Map buserMerchantIdMap = new HashMap(); if (null != busrlist ) { for (int i = 0 ; i < busrlist.size() ; i ++) { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index e02581647..d3ac99ddb 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -156,10 +156,16 @@ - select id, phone, nick_name from wx_c_user_basic_info wcubi - + where wcubi.`final_tenant_id` = #{finalTenantId} + + and wcubi.id in + + #{idItem} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c48f9ed4e..8f894967f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -324,10 +324,9 @@ - select id,title,sale_price,use_price,price,auto_refund,business,subsidy_type,source_type - from wx_coupon c - + from wx_coupon c.`tenant_id` = #{tenantId} SELECT wcm.product_id,wcm.merchant_id,COUNT(1) AS mc FROM wx_coupon_merchant wcm - WHERE STATUS = 0 + WHERE wcm.STATUS = 0 and wcm.`tenant_id` = #{tenantId} @@ -160,7 +160,7 @@ - select id, merchant_id from wx_merchant_b_user - + where `tenant_id` = #{tenantId} + + and id in + + #{idItem} + +