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

--添加扫码支付

Browse Source
This commit is contained in:
xuwenbo
2021-05-05 12:15:06 +08:00
parent 421fa95b44
commit 4d71eb3e55
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
View File

@ -36,6 +36,7 @@ import com.alibaba.fastjson.JSONObject;
import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult; import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult; import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -217,7 +218,16 @@ public class OrderSupplyService {
map.put("result",orderDTO); map.put("result",orderDTO);
map.put("payMsg","订单创建成功"); map.put("payMsg","订单创建成功");
return map; return map;
}else{//公众号 }else if(AppFromEnum.PC.getValue().equals(from)){ //扫码支付
map.put("status","WECHAT_PC_PAY");
WxPayNativeOrderResult wxPayNativeOrderResult = (WxPayNativeOrderResult)weixinPayService
.unifyPay(orderId,from, BillDetailEnum.TYPE_3.getValue(),"APP商品购买");
jsConfig.put("codeUrl",wxPayNativeOrderResult.getCodeUrl());
orderDTO.setJsConfig(jsConfig);
map.put("result",orderDTO);
map.put("payMsg","订单创建成功");
}
else{//公众号
map.put("status","WECHAT_PAY"); map.put("status","WECHAT_PAY");
WxPayMpOrderResult wxPayMpOrderResult = (WxPayMpOrderResult)weixinPayService WxPayMpOrderResult wxPayMpOrderResult = (WxPayMpOrderResult)weixinPayService
.unifyPay(orderId,from, BillDetailEnum.TYPE_3.getValue(),"公众号商品购买"); .unifyPay(orderId,from, BillDetailEnum.TYPE_3.getValue(),"公众号商品购买");

1
yshop-common/src/main/java/co/yixiang/enums/AppFromEnum.java
View File

@ -20,6 +20,7 @@ public enum AppFromEnum {
H5("h5","H5"), H5("h5","H5"),
WECHAT("wechat","公众号"), WECHAT("wechat","公众号"),
APP("app","APP"), APP("app","APP"),
PC("pc","PC"),
ROUNTINE("routine","小程序"), ROUNTINE("routine","小程序"),
UNIAPPH5("uniappH5","uniappH5"); UNIAPPH5("uniappH5","uniappH5");

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

@ -116,7 +116,7 @@ public class WeixinPayService {
WxPayService wxPayService = null; WxPayService wxPayService = null;
if(AppFromEnum.ROUNTINE.getValue().equals(from)){ if(AppFromEnum.ROUNTINE.getValue().equals(from)){
wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP); wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP);
}else if(AppFromEnum.APP.getValue().equals(from)){ }else if(AppFromEnum.APP.getValue().equals(from) || AppFromEnum.PC.getValue().equals(from)){
wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP); wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP);
}else{ }else{
wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WECHAT); wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WECHAT);
@ -133,6 +133,8 @@ public class WeixinPayService {
orderRequest.setTradeType("MWEB"); orderRequest.setTradeType("MWEB");
}else if(AppFromEnum.APP.getValue().equals(from)){ }else if(AppFromEnum.APP.getValue().equals(from)){
orderRequest.setTradeType("APP"); orderRequest.setTradeType("APP");
}else if(AppFromEnum.PC.getValue().equals(from)){
orderRequest.setTradeType("NATIVE");
} else{ } else{
orderRequest.setTradeType("JSAPI"); orderRequest.setTradeType("JSAPI");
if(AppFromEnum.ROUNTINE.getValue().equals(from)){ if(AppFromEnum.ROUNTINE.getValue().equals(from)){