From 2de7be905bc2e4956590bacd5078d073012f7502 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 4 Feb 2020 13:37:53 +0800 Subject: [PATCH] =?UTF-8?q?yshop1.9.3=E5=8F=91=E5=B8=83=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreOrderServiceImpl.java | 84 +++++++++++-------- .../service/YxStoreCouponUserService.java | 2 + .../impl/YxStoreCouponUserServiceImpl.java | 7 ++ .../user/service/impl/YxUserServiceImpl.java | 5 ++ .../web/vo/YxWechatTemplateQueryVo.java | 32 +++---- .../shop/rest/YxStoreOrderController.java | 54 +++++++----- 6 files changed, 112 insertions(+), 72 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 6f00e20e..48b8c56f 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -267,17 +267,22 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq("tempkey","OPENTM410119152")); - Map map = new HashMap<>(); - map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); - map.put("keyword1",orderQueryVo.getOrderId());//订单号 - map.put("keyword2",orderQueryVo.getPayPrice().toString()); - map.put("keyword3",OrderUtil.stampToDate(orderQueryVo.getAddTime().toString())); - map.put("remark","yshop电商系统为你服务！"); - templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() - ,WechatTemplate.getTempid(), - siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); + if(StrUtil.isNotBlank(wechatUser.getOpenid())){ + YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( + new QueryWrapper().eq("tempkey","OPENTM410119152")); + Map map = new HashMap<>(); + map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); + map.put("keyword1",orderQueryVo.getOrderId());//订单号 + map.put("keyword2",orderQueryVo.getPayPrice().toString()); + map.put("keyword3",OrderUtil.stampToDate(orderQueryVo.getAddTime().toString())); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() + ,WechatTemplate.getTempid(), + siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); + }else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){ + //todo 小程序通知 + } + } @@ -316,18 +321,23 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq("tempkey","OPENTM200565259")); - //付款成功微信模板通知用户 - Map map = new HashMap<>(); - map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); - map.put("keyword1",storeOrder.getOrderId());//订单号 - map.put("keyword2",expressQueryVo.getName()); - map.put("keyword3",param.getDeliveryId()); - map.put("remark","yshop电商系统为你服务！"); - templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() - ,WechatTemplate.getTempid(), - siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); + if(StrUtil.isNotBlank(wechatUser.getOpenid())){ + YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( + new QueryWrapper().eq("tempkey","OPENTM200565259")); + //付款成功微信模板通知用户 + Map map = new HashMap<>(); + map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); + map.put("keyword1",storeOrder.getOrderId());//订单号 + map.put("keyword2",expressQueryVo.getName()); + map.put("keyword3",param.getDeliveryId()); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() + ,WechatTemplate.getTempid(), + siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); + }else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){ + //todo 小程序通知 + } + } } @@ -995,17 +1005,23 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq("tempkey","OPENTM207791277")); - //付款成功微信模板通知用户 - Map map = new HashMap<>(); - map.put("first","您的订单已支付成功，我们会尽快为您发货。"); - map.put("keyword1",orderInfo.getOrderId());//订单号 - map.put("keyword2",orderInfo.getPayPrice().toString()); - map.put("remark","yshop电商系统为你服务！"); - templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() - ,WechatTemplate.getTempid(), - siteUrl+"/order/detail/"+orderInfo.getOrderId(),map); + //公众号模板通知 + if(StrUtil.isNotBlank(wechatUser.getOpenid())){ + YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( + new QueryWrapper().eq("tempkey","OPENTM207791277")); + //付款成功微信模板通知用户 + Map map = new HashMap<>(); + map.put("first","您的订单已支付成功，我们会尽快为您发货。"); + map.put("keyword1",orderInfo.getOrderId());//订单号 + map.put("keyword2",orderInfo.getPayPrice().toString()); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() + ,WechatTemplate.getTempid(), + siteUrl+"/order/detail/"+orderInfo.getOrderId(),map); + }else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){ + //todo 小程序模板通知 + + } } } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java index b646bbfa..dd6565f3 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java @@ -19,6 +19,8 @@ import java.util.List; */ public interface YxStoreCouponUserService extends BaseService { + int getUserValidCouponCount(int uid); + void useCoupon(int id); YxStoreCouponUser getCoupon(int id,int uid); diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java index 507bbc8e..32cd804d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java @@ -49,6 +49,13 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl wrapper= new QueryWrapper<>(); + wrapper.eq("status",0).eq("uid",uid); + return yxStoreCouponUserMapper.selectCount(wrapper); + } @Override public List beUsableCouponList(int uid, double price) { diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index c1185dc0..bf0db9dc 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -7,6 +7,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; +import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; @@ -64,6 +65,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imp @Autowired private YxUserLevelService userLevelService; + @Autowired + private YxStoreCouponUserService storeCouponUserService; + /** * 返回会员价 * @param price @@ -416,6 +420,7 @@ public class YxUserServiceImpl extends BaseServiceImpl imp public YxUserQueryVo getNewYxUserById(Serializable id) { YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id); userQueryVo.setOrderStatusNum(orderService.orderData((int)id)); + userQueryVo.setCouponCount(storeCouponUserService.getUserValidCouponCount((int)id)); //判断分销类型 String statu = systemConfigService.getData("store_brokerage_statu"); if(StrUtil.isNotEmpty(statu)){ diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java index d8810c84..957cdd93 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java @@ -15,29 +15,29 @@ import java.io.Serializable; * @date 2019-12-10 */ @Data -@ApiModel(value="YxWechatTemplateQueryVo对象", description="微信模板查询参数") -public class YxWechatTemplateQueryVo implements Serializable{ +@ApiModel(value = "YxWechatTemplateQueryVo对象", description = "微信模板查询参数") +public class YxWechatTemplateQueryVo implements Serializable { private static final long serialVersionUID = 1L; -@ApiModelProperty(value = "模板id") -private Integer id; + @ApiModelProperty(value = "模板id") + private Integer id; -@ApiModelProperty(value = "模板编号") -private String tempkey; + @ApiModelProperty(value = "模板编号") + private String tempkey; -@ApiModelProperty(value = "模板名") -private String name; + @ApiModelProperty(value = "模板名") + private String name; -@ApiModelProperty(value = "回复内容") -private String content; + @ApiModelProperty(value = "回复内容") + private String content; -@ApiModelProperty(value = "模板ID") -private String tempid; + @ApiModelProperty(value = "模板ID") + private String tempid; -@ApiModelProperty(value = "添加时间") -private String addTime; + @ApiModelProperty(value = "添加时间") + private String addTime; -@ApiModelProperty(value = "状态") -private Integer status; + @ApiModelProperty(value = "状态") + private Integer status; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java index cab1f9b3..23ea2583 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java @@ -172,17 +172,22 @@ public class YxStoreOrderController { try{ YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); if(ObjectUtil.isNotNull(wechatUser)){ - YxWechatTemplate WechatTemplate = yxWechatTemplateService - .findByTempkey("OPENTM200565259"); - Map map = new HashMap<>(); - map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); - map.put("keyword1",resources.getOrderId());//订单号 - map.put("keyword2",expressDTO.getName()); - map.put("keyword3",resources.getDeliveryId()); - map.put("remark","yshop电商系统为你服务！"); - templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() - ,WechatTemplate.getTempid(), - siteUrl+"/order/detail/"+resources.getOrderId(),map); + if(StrUtil.isNotBlank(wechatUser.getOpenid())){ + YxWechatTemplate WechatTemplate = yxWechatTemplateService + .findByTempkey("OPENTM200565259"); + Map map = new HashMap<>(); + map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); + map.put("keyword1",resources.getOrderId());//订单号 + map.put("keyword2",expressDTO.getName()); + map.put("keyword3",resources.getDeliveryId()); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() + ,WechatTemplate.getTempid(), + siteUrl+"/order/detail/"+resources.getOrderId(),map); + }else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){ + //todo 小程序通知 + } + } }catch (Exception e){ log.info("当前用户不是微信用户不能发送模板消息哦!"); @@ -204,17 +209,22 @@ public class YxStoreOrderController { try{ YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); if(ObjectUtil.isNotNull(wechatUser)){ - YxWechatTemplate WechatTemplate = yxWechatTemplateService - .findByTempkey("OPENTM410119152"); - Map map = new HashMap<>(); - map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); - map.put("keyword1",resources.getOrderId());//订单号 - map.put("keyword2",resources.getPayPrice().toString()); - map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString())); - map.put("remark","yshop电商系统为你服务！"); - templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() - ,WechatTemplate.getTempid(), - siteUrl+"/order/detail/"+resources.getOrderId(),map); + if(StrUtil.isNotBlank(wechatUser.getOpenid())){ + YxWechatTemplate WechatTemplate = yxWechatTemplateService + .findByTempkey("OPENTM410119152"); + Map map = new HashMap<>(); + map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); + map.put("keyword1",resources.getOrderId());//订单号 + map.put("keyword2",resources.getPayPrice().toString()); + map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString())); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() + ,WechatTemplate.getTempid(), + siteUrl+"/order/detail/"+resources.getOrderId(),map); + }else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){ + //todo 小程序通知 + } + } }catch (Exception e){ log.info("当前用户不是微信用户不能发送模板消息哦!");