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

微信支付新增小程序渠道,修复小程序与其他支付appid冲突问题

Browse Source
This commit is contained in:
hupeng
2020-03-12 14:16:30 +08:00
parent 6adedb1687
commit ec863e471e
8 changed files with 184 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java
View File

@ -61,8 +61,9 @@ public class SystemConfigController {
//重新配置微信相关
if(key.equals("wechat_appid")){
WxMpConfiguration.removeWxMpService();
WxPayConfiguration.removeWxPayService();
}
if(key.equals("wxpay_appId")){
if(key.equals("wxpay_mchId") || key.equals("wxapp_appId")){
WxPayConfiguration.removeWxPayService();
}
RedisUtil.set(key,value.toString(),0);

15
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java
View File

@ -21,6 +21,7 @@ import co.yixiang.modules.shop.service.YxUserBillService;
import co.yixiang.modules.shop.service.YxUserService;
import co.yixiang.modules.shop.service.dto.*;
import co.yixiang.modules.shop.service.mapper.YxStoreOrderMapper;
import co.yixiang.mp.service.YxMiniPayService;
import co.yixiang.mp.service.YxPayService;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.QueryHelp;
@ -57,11 +58,12 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService {
private final YxStoreOrderStatusService yxStoreOrderStatusService;
private final YxUserService userService;
private final YxPayService payService;
private final YxMiniPayService miniPayService;
public YxStoreOrderServiceImpl(YxStoreOrderRepository yxStoreOrderRepository, YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository, YxUserRepository userRepository,
YxStorePinkRepository storePinkRepository, YxStoreOrderMapper yxStoreOrderMapper, YxUserBillService yxUserBillService,
YxStoreOrderStatusService yxStoreOrderStatusService,
YxUserService userService, YxPayService payService) {
YxUserService userService, YxPayService payService, YxMiniPayService miniPayService) {
this.yxStoreOrderRepository = yxStoreOrderRepository;
this.yxStoreOrderCartInfoRepository = yxStoreOrderCartInfoRepository;
this.userRepository = userRepository;
@ -71,6 +73,7 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService {
this.yxStoreOrderStatusService = yxStoreOrderStatusService;
this.userService = userService;
this.payService = payService;
this.miniPayService = miniPayService;
}
@Override
@ -155,8 +158,14 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService {
}else{
BigDecimal bigDecimal = new BigDecimal("100");
try {
payService.refundOrder(resources.getOrderId(),
bigDecimal.multiply(resources.getPayPrice()).intValue());
if(OrderInfoEnum.PAY_CHANNEL_1.getValue().equals(resources.getIsChannel())){
miniPayService.refundOrder(resources.getOrderId(),
bigDecimal.multiply(resources.getPayPrice()).intValue());
}else{
payService.refundOrder(resources.getOrderId(),
bigDecimal.multiply(resources.getPayPrice()).intValue());
}
} catch (WxPayException e) {
log.info("refund-error:{}",e.getMessage());
}