diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 8215aad8c..c6c7ffb8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -16,6 +16,7 @@ import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumCouponStatus; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.*; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; @@ -23,6 +24,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +41,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -83,6 +86,9 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired private ExcelService excelService; + @Autowired + private WxMerchantMapper wxMerchantMapper; + private void setUserInfoLevel(WxCUserBasicInfo info) { if (info.getPoins() == null || info.getPoins() == 0) { @@ -244,6 +250,14 @@ public class WxCUserBasicInfoController extends BaseController { WxCoupon coupon = wxCouponService.getById(c.getCouponId()); c.setCouponName(coupon.getTitle()); c.setSalePrice(coupon.getPrice()); + + if(c.getCouponId() != null) { + HashMap param = new HashMap<>(); + param.put("id", c.getCouponId() + ""); + WxMerchant w = wxMerchantMapper.findByTrade(param); + if (w != null) + c.setMerchantName(w.getName()); + } } } return new ResultData(Result.SUCCESS, "查询成功", page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 7d79234d5..8c8322d8c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -74,6 +74,9 @@ public class WxCouponOrder extends BaseEntity{ @TableField(exist = false) private Integer subBusinessId; + @TableField(exist = false) + private String merchantName; + public String getCouponPriceStr() { if(couponPrice!=null) { DecimalFormat df=new DecimalFormat("0.00"); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index a88e38eea..24f92f6f3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -33,5 +33,5 @@ public interface WxMerchantMapper extends CommonMapper { List userTradeDetailList(WxMerchant wxMerchant); - + WxMerchant findByTrade(HashMap params); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 096563c53..1312461dc 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -428,8 +428,7 @@ (select count(*) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) - inner join wx_merchant_b_user mb on(mb.id=c.id) + inner join wx_merchant_b_user mb on(mb.id=o.b_user_id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id and o.create_date >= #{starttime} @@ -439,11 +438,10 @@ ) consumeCount, - (select count(distinct c.id) from wx_coupon_order o + (select count(distinct mb.id) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) - inner join wx_merchant_b_user mb on(mb.id=c.id) + inner join wx_merchant_b_user mb on(mb.id=o.b_user_id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id and o.create_date >= #{starttime} @@ -456,8 +454,7 @@ IFNULL((select sum(co.price) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) - inner join wx_merchant_b_user mb on(mb.id=c.id) + inner join wx_merchant_b_user mb on(mb.id=o.b_user_id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id and o.create_date >= #{starttime} @@ -465,7 +462,6 @@ and o.create_date <= #{endtime} - ),0) tradeAmt from wx_merchant m where m.status=1 @@ -482,12 +478,13 @@ + + +