cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.9.3发布修复个人中心优惠券数量等问题

Browse Source
This commit is contained in:
hupeng
2020-02-04 13:37:53 +08:00
parent 533209cf74
commit 2de7be905b
6 changed files with 112 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -267,17 +267,22 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
String siteUrl = RedisUtil.get("site_url"); String siteUrl = RedisUtil.get("site_url");
YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderQueryVo.getUid()); YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderQueryVo.getUid());
if(ObjectUtil.isNotNull(wechatUser)){ if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( if(StrUtil.isNotBlank(wechatUser.getOpenid())){
new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM410119152")); YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne(
Map<String,String> map = new HashMap<>(); new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM410119152"));
map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); Map<String,String> map = new HashMap<>();
map.put("keyword1",orderQueryVo.getOrderId());//订单号 map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。");
map.put("keyword2",orderQueryVo.getPayPrice().toString()); map.put("keyword1",orderQueryVo.getOrderId());//订单号
map.put("keyword3",OrderUtil.stampToDate(orderQueryVo.getAddTime().toString())); map.put("keyword2",orderQueryVo.getPayPrice().toString());
map.put("remark","yshop电商系统为你服务！"); map.put("keyword3",OrderUtil.stampToDate(orderQueryVo.getAddTime().toString()));
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("remark","yshop电商系统为你服务！");
,WechatTemplate.getTempid(), templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); ,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map);
}else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){
//todo 小程序通知
}
} }
@ -316,18 +321,23 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
String siteUrl = RedisUtil.get("site_url"); String siteUrl = RedisUtil.get("site_url");
YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderQueryVo.getUid()); YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderQueryVo.getUid());
if(ObjectUtil.isNotNull(wechatUser)){ if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( if(StrUtil.isNotBlank(wechatUser.getOpenid())){
new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM200565259")); YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne(
//付款成功微信模板通知用户 new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM200565259"));
Map<String,String> map = new HashMap<>(); //付款成功微信模板通知用户
map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); Map<String,String> map = new HashMap<>();
map.put("keyword1",storeOrder.getOrderId());//订单号 map.put("first","亲，宝贝已经启程了，好想快点来到你身边。");
map.put("keyword2",expressQueryVo.getName()); map.put("keyword1",storeOrder.getOrderId());//订单号
map.put("keyword3",param.getDeliveryId()); map.put("keyword2",expressQueryVo.getName());
map.put("remark","yshop电商系统为你服务！"); map.put("keyword3",param.getDeliveryId());
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("remark","yshop电商系统为你服务！");
,WechatTemplate.getTempid(), templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map); ,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+orderQueryVo.getOrderId(),map);
}else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){
//todo 小程序通知
}
} }
} }
@ -995,17 +1005,23 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
String siteUrl = RedisUtil.get("site_url"); String siteUrl = RedisUtil.get("site_url");
YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderInfo.getUid()); YxWechatUserQueryVo wechatUser = wechatUserService.getYxWechatUserById(orderInfo.getUid());
if(ObjectUtil.isNotNull(wechatUser)){ if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne( //公众号模板通知
new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM207791277")); if(StrUtil.isNotBlank(wechatUser.getOpenid())){
//付款成功微信模板通知用户 YxWechatTemplate WechatTemplate = yxWechatTemplateService.getOne(
Map<String,String> map = new HashMap<>(); new QueryWrapper<YxWechatTemplate>().eq("tempkey","OPENTM207791277"));
map.put("first","您的订单已支付成功，我们会尽快为您发货。"); //付款成功微信模板通知用户
map.put("keyword1",orderInfo.getOrderId());//订单号 Map<String,String> map = new HashMap<>();
map.put("keyword2",orderInfo.getPayPrice().toString()); map.put("first","您的订单已支付成功，我们会尽快为您发货。");
map.put("remark","yshop电商系统为你服务！"); map.put("keyword1",orderInfo.getOrderId());//订单号
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("keyword2",orderInfo.getPayPrice().toString());
,WechatTemplate.getTempid(), map.put("remark","yshop电商系统为你服务！");
siteUrl+"/order/detail/"+orderInfo.getOrderId(),map); templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+orderInfo.getOrderId(),map);
}else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){
//todo 小程序模板通知
}
} }
} }

2
yshop-api/src/main/java/co/yixiang/modules/shop/service/YxStoreCouponUserService.java
View File

@ -19,6 +19,8 @@ import java.util.List;
*/ */
public interface YxStoreCouponUserService extends BaseService<YxStoreCouponUser> { public interface YxStoreCouponUserService extends BaseService<YxStoreCouponUser> {
int getUserValidCouponCount(int uid);
void useCoupon(int id); void useCoupon(int id);
YxStoreCouponUser getCoupon(int id,int uid); YxStoreCouponUser getCoupon(int id,int uid);

7
yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCouponUserServiceImpl.java
View File

@ -49,6 +49,13 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl<YxStoreCouponU
@Autowired @Autowired
private CouponMap couponMap; private CouponMap couponMap;
@Override
public int getUserValidCouponCount(int uid) {
checkInvalidCoupon(uid);
QueryWrapper<YxStoreCouponUser> wrapper= new QueryWrapper<>();
wrapper.eq("status",0).eq("uid",uid);
return yxStoreCouponUserMapper.selectCount(wrapper);
}
@Override @Override
public List<YxStoreCouponUser> beUsableCouponList(int uid, double price) { public List<YxStoreCouponUser> beUsableCouponList(int uid, double price) {

5
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java
View File

@ -7,6 +7,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging; import co.yixiang.common.web.vo.Paging;
import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderService;
import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo; 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.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUser;
import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxUserBill;
@ -64,6 +65,9 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
@Autowired @Autowired
private YxUserLevelService userLevelService; private YxUserLevelService userLevelService;
@Autowired
private YxStoreCouponUserService storeCouponUserService;
/** /**
* 返回会员价 * 返回会员价
* @param price * @param price
@ -416,6 +420,7 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
public YxUserQueryVo getNewYxUserById(Serializable id) { public YxUserQueryVo getNewYxUserById(Serializable id) {
YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id); YxUserQueryVo userQueryVo = yxUserMapper.getYxUserById(id);
userQueryVo.setOrderStatusNum(orderService.orderData((int)id)); userQueryVo.setOrderStatusNum(orderService.orderData((int)id));
userQueryVo.setCouponCount(storeCouponUserService.getUserValidCouponCount((int)id));
//判断分销类型 //判断分销类型
String statu = systemConfigService.getData("store_brokerage_statu"); String statu = systemConfigService.getData("store_brokerage_statu");
if(StrUtil.isNotEmpty(statu)){ if(StrUtil.isNotEmpty(statu)){

32
yshop-api/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java
View File

@ -15,29 +15,29 @@ import java.io.Serializable;
* @date 2019-12-10 * @date 2019-12-10
*/ */
@Data @Data
@ApiModel(value="YxWechatTemplateQueryVo对象", description="微信模板查询参数") @ApiModel(value = "YxWechatTemplateQueryVo对象", description = "微信模板查询参数")
public class YxWechatTemplateQueryVo implements Serializable{ public class YxWechatTemplateQueryVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模板id") @ApiModelProperty(value = "模板id")
private Integer id; private Integer id;
@ApiModelProperty(value = "模板编号") @ApiModelProperty(value = "模板编号")
private String tempkey; private String tempkey;
@ApiModelProperty(value = "模板名") @ApiModelProperty(value = "模板名")
private String name; private String name;
@ApiModelProperty(value = "回复内容") @ApiModelProperty(value = "回复内容")
private String content; private String content;
@ApiModelProperty(value = "模板ID") @ApiModelProperty(value = "模板ID")
private String tempid; private String tempid;
@ApiModelProperty(value = "添加时间") @ApiModelProperty(value = "添加时间")
private String addTime; private String addTime;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private Integer status; private Integer status;
} }

54
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java
View File

@ -172,17 +172,22 @@ public class YxStoreOrderController {
try{ try{
YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid());
if(ObjectUtil.isNotNull(wechatUser)){ if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService if(StrUtil.isNotBlank(wechatUser.getOpenid())){
.findByTempkey("OPENTM200565259"); YxWechatTemplate WechatTemplate = yxWechatTemplateService
Map<String,String> map = new HashMap<>(); .findByTempkey("OPENTM200565259");
map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); Map<String,String> map = new HashMap<>();
map.put("keyword1",resources.getOrderId());//订单号 map.put("first","亲，宝贝已经启程了，好想快点来到你身边。");
map.put("keyword2",expressDTO.getName()); map.put("keyword1",resources.getOrderId());//订单号
map.put("keyword3",resources.getDeliveryId()); map.put("keyword2",expressDTO.getName());
map.put("remark","yshop电商系统为你服务！"); map.put("keyword3",resources.getDeliveryId());
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("remark","yshop电商系统为你服务！");
,WechatTemplate.getTempid(), templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
siteUrl+"/order/detail/"+resources.getOrderId(),map); ,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+resources.getOrderId(),map);
}else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){
//todo 小程序通知
}
} }
}catch (Exception e){ }catch (Exception e){
log.info("当前用户不是微信用户不能发送模板消息哦!"); log.info("当前用户不是微信用户不能发送模板消息哦!");
@ -204,17 +209,22 @@ public class YxStoreOrderController {
try{ try{
YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid());
if(ObjectUtil.isNotNull(wechatUser)){ if(ObjectUtil.isNotNull(wechatUser)){
YxWechatTemplate WechatTemplate = yxWechatTemplateService if(StrUtil.isNotBlank(wechatUser.getOpenid())){
.findByTempkey("OPENTM410119152"); YxWechatTemplate WechatTemplate = yxWechatTemplateService
Map<String,String> map = new HashMap<>(); .findByTempkey("OPENTM410119152");
map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。"); Map<String,String> map = new HashMap<>();
map.put("keyword1",resources.getOrderId());//订单号 map.put("first","您在yshop的订单退款申请被通过，钱款将很快还至您的支付账户。");
map.put("keyword2",resources.getPayPrice().toString()); map.put("keyword1",resources.getOrderId());//订单号
map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString())); map.put("keyword2",resources.getPayPrice().toString());
map.put("remark","yshop电商系统为你服务！"); map.put("keyword3", OrderUtil.stampToDate(resources.getAddTime().toString()));
templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid() map.put("remark","yshop电商系统为你服务！");
,WechatTemplate.getTempid(), templateMessageService.sendWxMpTemplateMessage( wechatUser.getOpenid()
siteUrl+"/order/detail/"+resources.getOrderId(),map); ,WechatTemplate.getTempid(),
siteUrl+"/order/detail/"+resources.getOrderId(),map);
}else if(StrUtil.isNotBlank(wechatUser.getRoutineOpenid())){
//todo 小程序通知
}
} }
}catch (Exception e){ }catch (Exception e){
log.info("当前用户不是微信用户不能发送模板消息哦!"); log.info("当前用户不是微信用户不能发送模板消息哦!");