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

yshop3.0-RC2版本

Browse Source
This commit is contained in:
hupeng
2020-07-09 15:16:42 +08:00
parent 7347f37e19
commit 43f5ef2e41
353 changed files with 12676 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-weixin/src/main/java/co/yixiang/mp/listener/TemplateListener.java
View File

@ -9,6 +9,7 @@
package co.yixiang.mp.listener;
import co.yixiang.enums.PayTypeEnum;
import co.yixiang.event.TemplateBean;
import co.yixiang.event.TemplateEvent;
import co.yixiang.event.TemplateListenEnum;
@ -56,9 +57,11 @@ public class TemplateListener implements SmartApplicationListener {
break;
case TYPE_2:
//处理退款与消息
BigDecimal bigDecimal = new BigDecimal("100");
int payPrice = bigDecimal.multiply(new BigDecimal(templateBean.getPrice())).intValue();
weixinPayService.refundOrder(templateBean.getOrderId(),payPrice);
if(PayTypeEnum.WEIXIN.getValue().equals(templateBean.getPayType())){
BigDecimal bigDecimal = new BigDecimal("100");
int payPrice = bigDecimal.multiply(new BigDecimal(templateBean.getPrice())).intValue();
weixinPayService.refundOrder(templateBean.getOrderId(),payPrice);
}
weixinTemplateService.refundSuccessNotice(templateBean.getOrderId(),templateBean.getPrice(),
templateBean.getUid(),templateBean.getTime());

5
yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java
View File

@ -21,11 +21,8 @@ import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.mp.config.WxPayConfiguration;
import co.yixiang.mp.utils.YshopUtils;
import co.yixiang.utils.RedisUtil;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
@ -98,7 +95,7 @@ public class WeixinPayService {
if(yxUser == null) throw new YshopException("用户错误");
WechatUserDto wechatUserDto = YshopUtils.getWechtUser(yxUser.getWxProfile());
WechatUserDto wechatUserDto = yxUser.getWxProfile();
WxPayService wxPayService = null;
if(AppFromEnum.ROUNTINE.getValue().equals(from)){

4
yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java
View File

@ -17,7 +17,6 @@ import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.YxWechatTemplateService;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.mp.enums.WechatTempateEnum;
import co.yixiang.mp.utils.YshopUtils;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;
import me.chanjar.weixin.common.error.WxErrorException;
@ -199,9 +198,8 @@ public class WeixinTemplateService {
private String getUserOpenid(Long uid){
YxUser yxUser = userService.getById(uid);
if(yxUser == null) return "";
if(StrUtil.isBlank(yxUser.getWxProfile())) return "";
WechatUserDto wechatUserDto = YshopUtils.getWechtUser(yxUser.getWxProfile());
WechatUserDto wechatUserDto = yxUser.getWxProfile();
if(wechatUserDto == null) return "";
if(StrUtil.isBlank(wechatUserDto.getOpenid())) return "";
return wechatUserDto.getOpenid();