diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 7251a339d..52d4bf843 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -122,6 +122,7 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setUpdateDate(new Date()); try { + wxCouponSend.setOperatorId(getUserId()); wxCouponSendService.saveOrUpdate(wxCouponSend); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index 80c977d35..3943f7d6c 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -4,16 +4,16 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxCUser; import com.iformall.exception.MallinkException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - -import java.util.concurrent.TimeUnit; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/live") @@ -27,7 +27,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取所有直播间和商品信息") - @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 10) @GetMapping("/roomList") public ResultData getLiveinfos(String appId, Integer start, Integer limit) { ResultData resultData = new ResultData(); @@ -52,7 +52,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取直播房间回放数据和商品信息") - @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 10) @GetMapping("/replayList") public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { ResultData resultData = new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index f98d6690c..69a2f2446 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -112,6 +112,14 @@ public class WxCouponSend extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效,全部时不传",name="status") private Integer status; + @JsonIgnore + @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") + private Long operatorId; + + @io.swagger.annotations.ApiModelProperty(value="操作人",name="operator") + @TableField(exist = false) + private String operator; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index fcdc89bd2..d73e6b1d4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -130,7 +130,16 @@ public class WxCouponOrderBVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") private String merchantName; - @Excel(name = "商铺号", width = 50, orderNum = "5") +// public String getMerchantName() { +// if(this.getCmCount() != null && this.getCmCount() > 1){ +// this.merchantName = "[多商户通用]"; +// } +// return merchantName; +// } + +// private Integer cmCount; + +// @Excel(name = "商铺号", width = 50, orderNum = "5") @TableField(exist = false) private String shopNumber; @@ -151,6 +160,13 @@ public class WxCouponOrderBVo extends WxCouponOrder { @TableField(exist = false) private Long merchantId; +// public Long getmerchantId(){ +// if(this.getCmCount() != null && this.getCmCount() > 1){ +// this.merchantId = Long.valueOf(0); +// } +// return merchantId; +// } + @TableField(exist = false) private Date verifyStartDate; @@ -173,7 +189,7 @@ public class WxCouponOrderBVo extends WxCouponOrder { @TableField(exist = false) private Integer building; - @Excel(name = "楼层楼座", width = 50, orderNum = "12") +// @Excel(name = "楼层楼座", width = 50, orderNum = "12") @TableField(exist = false) private String buildingStr; 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 772cf1f64..c76b71725 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -312,21 +312,21 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (c.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { c.setUpdateDate(null); } - if (!c.getMerchantId().equals(0L)) { - List merchantVoList = c.getMerchantVoList(); - if (!CollectionUtils.isEmpty(merchantVoList)) { - StringBuilder shopNumber = new StringBuilder(); - StringBuilder building = new StringBuilder(); - WxMerchantVo wxMerchantVo = merchantVoList.get(0); - List shopVoList = wxMerchantVo.getShopVoList(); - for (WxShopVo wxShopVo : shopVoList) { - shopNumber.append(wxShopVo.getShopNumber()).append(";"); - building.append(wxShopVo.getBuildingName()).append(wxShopVo.getFloorName()).append(";"); - } - c.setShopNumber(shopNumber.toString()); - c.setBuildingStr(building.toString()); - } - } +// if (!c.getMerchantId().equals(0L)) { +// List merchantVoList = c.getMerchantVoList(); +// if (!CollectionUtils.isEmpty(merchantVoList)) { +// StringBuilder shopNumber = new StringBuilder(); +// StringBuilder building = new StringBuilder(); +// WxMerchantVo wxMerchantVo = merchantVoList.get(0); +// List shopVoList = wxMerchantVo.getShopVoList(); +// for (WxShopVo wxShopVo : shopVoList) { +// shopNumber.append(wxShopVo.getShopNumber()).append(";"); +// building.append(wxShopVo.getBuildingName()).append(wxShopVo.getFloorName()).append(";"); +// } +// c.setShopNumber(shopNumber.toString()); +// c.setBuildingStr(building.toString()); +// } +// } }); excelService.exportCsv(list, null, filename, WxCouponOrderBVo.class, filename + ".csv", response, false); } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index ffcd1a720..06df2ba06 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -198,7 +198,8 @@ select + + + FROM ( + SELECT wcm.product_id,wcm.merchant_id,COUNT(1) AS mc + FROM wx_coupon_merchant wcm + WHERE STATUS = 0 AND wcm.tenant_id = #{tenantId} GROUP BY product_id) couc + RIGHT JOIN ( + SELECT co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, + co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + FROM wx_coupon_order co + WHERE co.tenant_id = #{tenantId}) co + ON co.coupon_id = couc.product_id + INNER JOIN wx_c_user cu ON cu.id=co.c_user_id + LEFT JOIN wx_coupon c ON c.id = co.coupon_id + LEFT JOIN wx_merchant m1 ON m1.id = couc.merchant_id + LEFT JOIN wx_merchant_subsidy ms ON co.id = ms.coupon_order_id AND ms.type = 1 + LEFT JOIN wx_merchant_b_user mbu ON mbu.id = co.b_user_id LEFT JOIN wx_merchant m2 ON m2.id = mbu.merchant_id + LEFT JOIN wx_coupon_action_log cal ON cal.coupon_order_id = co.id AND cal.coupon_id = co.coupon_id where 1=1 @@ -687,14 +731,16 @@ - and (case when com.mc=1 + + and (case when couc.mc=1 then - (select m.name from wx_merchant m, wx_coupon_merchant cm - where m.id = cm.merchant_id - and cm.product_id=co.coupon_id - and cm.status = 0) - else'[多商户通用]' end) - like concat('%', #{merchantName},'%') + m1.name + + else'[多商户通用]' end) + like concat('%', #{merchantName},'%') diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index b5d888853..882e07916 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -107,8 +107,10 @@