From 2cb6556522491f4c100029077172fe2cdec0df49 Mon Sep 17 00:00:00 2001 From: Burce Date: Sat, 23 May 2020 13:18:46 +0800 Subject: [PATCH 01/20] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=9B=B4=E6=92=AD]?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=83=E6=95=B4=E3=80=81=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxLiveController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index fc239aadf..80c977d35 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -27,13 +27,13 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取所有直播间和商品信息") - @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) @GetMapping("/roomList") - public ResultData getLiveinfos(String appId) { + public ResultData getLiveinfos(String appId, Integer start, Integer limit) { ResultData resultData = new ResultData(); try { WxMaService wxMaService = getWeappService(appId); - resultData.data = wxMaService.getLiveService().getLiveinfos(); + resultData.data = wxMaService.getLiveService().getLiveInfo(start,limit); } catch (WxErrorException e) { logger.error("getLiveinfos error", e); throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); @@ -52,7 +52,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取直播房间回放数据和商品信息") - @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) @GetMapping("/replayList") public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { ResultData resultData = new ResultData(); From b60b52469d6fd941f514249d446c546a891f3490 Mon Sep 17 00:00:00 2001 From: Burce Date: Sat, 23 May 2020 13:18:46 +0800 Subject: [PATCH 02/20] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=9B=B4=E6=92=AD]?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=83=E6=95=B4=E3=80=81=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxLiveController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index fc239aadf..80c977d35 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -27,13 +27,13 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取所有直播间和商品信息") - @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) @GetMapping("/roomList") - public ResultData getLiveinfos(String appId) { + public ResultData getLiveinfos(String appId, Integer start, Integer limit) { ResultData resultData = new ResultData(); try { WxMaService wxMaService = getWeappService(appId); - resultData.data = wxMaService.getLiveService().getLiveinfos(); + resultData.data = wxMaService.getLiveService().getLiveInfo(start,limit); } catch (WxErrorException e) { logger.error("getLiveinfos error", e); throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); @@ -52,7 +52,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取直播房间回放数据和商品信息") - @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) + @RedisCache(expireTime = 5, dateUnit = TimeUnit.MINUTES) @GetMapping("/replayList") public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { ResultData resultData = new ResultData(); From 6ad381acf1ba1bb2b275b009eb35d7eb16de002d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 19 May 2020 20:16:23 +0800 Subject: [PATCH 03/20] =?UTF-8?q?[=E6=A0=B8=E9=94=80][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=94=99=E8=AF=AF=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java index 1f95b9235..7bd23e3ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java @@ -36,10 +36,6 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { logger.error("券包ID未找到: " + msg.getCouponOrderId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券包ID未找到" + msg.getCouponOrderId()); } - if (couponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode())) { - logger.warn("券包ID已核销: " + msg.getCouponOrderId()); - return; - } WxMerchantBUser user = merchantBUserService.getById(msg.getBUserId()); if(user == null) { From 7fc1e87bcaf5779e778ebab93f3d3bcbed89cc4d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 19 May 2020 21:01:10 +0800 Subject: [PATCH 04/20] =?UTF-8?q?[=E6=A0=B8=E9=94=80=E8=A1=A5=E8=B4=B4][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=A4=9A=E4=BD=99=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponOrderServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 e0c87eb76..b6ba5c197 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -615,6 +615,17 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } if (subsidyNum != null && subsidyNum.intValue() > 0) { // 有补贴时入库 + // 检查补贴是否已经添加 + WxMerchantSubsidy merchantSubsidyQ = new WxMerchantSubsidy(); + merchantSubsidyQ.setCouponOrderId(couponOrder.getId()); + merchantSubsidyQ.setCouponType(couponOrder.getCouponType()); + merchantSubsidyQ.setType(EnumMerchantSubsidyType.MANUAL.getCode()); + List msList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(merchantSubsidyQ)); + if (msList.size() > 0) { + // 补贴已入库 + return; + } + // 新补贴入库 int iSubChargeFee = PayUtils.getPayRate(subsidyNum, payAccount.getRate(), false); Integer realSubsidyFee = subsidyNum - iSubChargeFee; From ffbdf0eb8af20f3387636ce0f3d5a344daf22309 Mon Sep 17 00:00:00 2001 From: bruce Date: Thu, 28 May 2020 11:09:24 +0800 Subject: [PATCH 05/20] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=B8=E6=93=8D=E4=BD=9C=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponSendController.java | 1 + .../main/java/com/iformall/domain/po/WxCouponSend.java | 8 ++++++++ .../src/main/resources/mapper/WxCouponSendMapper.xml | 2 ++ 3 files changed, 11 insertions(+) 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/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index f98d6690c..5459ac006 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 Integer operator; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") 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 @@ select - from wx_coupon_order co,wx_coupon c + from wx_coupon_order co, wx_coupon c where co.coupon_id = c.id and co.id = #{id} + + select tt.* from (select - , mui.name as operator from wx_coupon_send cs left join wx_coupon c on c.id = cs.coupon_id - left join mall_user_info mui on mui.id = cs.operator_id ) as tt where 1=1 and ((tt.valid_type=1