diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 191fd4320..222f29a80 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -189,5 +189,7 @@ public interface WxMerchantService { Map detailByShopId(TenantEntity tenantInfo, Long shopId); + List newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId); + List newFindByCouponId(TenantEntity tenantInfo, Long couponId); } 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 5cc30a7da..e9e5a1752 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -648,8 +648,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvo.setPickStartDate(coupon.getPickStartDate()); cvo.setPickEndDate(coupon.getPickEndDate()); cvo.setAutoRefund(coupon.getAutoRefund()); + cvo.setMerchantVoList(wxMerchantService.newFindWithShopByCouponId(cvo,coupon.getId())); } - cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,cvo.getCouponId())); return cvo; } catch (IllegalAccessException | InvocationTargetException e) { logger.error("getCouponOrderCVo error.",e); @@ -787,6 +787,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvo.setValidStartDate(coupon.getValidStartDate()); cvo.setValidEndDate(coupon.getValidEndDate()); cvo.setAutoRefund(coupon.getAutoRefund()); + cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,coupon.getId())); } WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); if (null != couponCar) { 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 0cdeb7af1..48ee9fc09 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1271,11 +1271,17 @@ public class WxMerchantServiceImpl implements WxMerchantService { return null; } + @Override + public List newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId) { + List wxMerchantVoList = this.newFindByCouponId(tenantInfo, couponId); + handleShopVo(tenantInfo,wxMerchantVoList); + return wxMerchantVoList; + } + @Override public List newFindByCouponId(TenantEntity tenantInfo, Long couponId) { List merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId); List wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds); - handleShopVo(tenantInfo,wxMerchantVoList); return wxMerchantVoList; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index dd2654011..01a66d7c1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -762,8 +762,8 @@ - order by ${sortColumns} - order by co.id desc + order by ${sortColumns} + order by co.update_date desc @@ -771,7 +771,11 @@ select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor, co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy - where co.id = #{id} and co.tenant_id = #{tenantId} and cu.final_tenant_id = #{finalTenantId} + FROM wx_coupon_order co + where co.id = #{id} and co.tenant_id = #{tenantId} + + and co.`parent_tenant_id` = #{parentTenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 6e26ee703..3d5ed97fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -188,7 +188,7 @@ #{cUserIdItem} - ORDER BY credit.id DESC + ORDER BY credit.create_date DESC limit #{begin}, #{limit} @@ -235,7 +235,7 @@