zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-05-11 13:12:47 +08:00
parent d40e408219 8282c37f53
commit df12bc2304
10 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -299,6 +299,7 @@ public class BuyOrderController {
paymentInfo.setOrderSn(orderSn);
paymentInfo.setBuyOrderId(buyOrder.getOrderId());
paymentInfo.setTotalAmount(totalPrice);
paymentInfo.setAppName(buyOrder.getAppName());
wxpayService.prepay(paymentInfo);
}
Map<String, Object> result = new HashMap<>();
@@ -528,6 +529,7 @@ public class BuyOrderController {
paymentInfo.setOrderSn(buyOrderEntity.getOrderSn());
paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId()));
paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney());
paymentInfo.setAppName(buyOrder.getAppName());
wxpayService.prepay(paymentInfo);
rabbitTemplate.convertAndSend(
DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE,

3
src/main/java/com/peanut/modules/common/entity/BuyOrder.java
View File

@@ -189,4 +189,7 @@ public class BuyOrder implements Serializable {
@TableField(exist = false)
private ConsigneeVo consigneeVo;
@TableField(exist = false)
private String appName;
}

4
src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
View File

@@ -42,7 +42,9 @@ public class WechatPayConfig implements Serializable {
* APPID
*/
@Value("${wxpay.appId}")
private String appId;
private String appId;//fzds
@Value("${wxpay.zmzmappId}")
private String zmzmappId;
/**
* 商户号
*/

10
src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
View File

@@ -63,8 +63,14 @@ public class WeChatPayController {
}
String nonceStr = UUID.randomUUID().toString().replace("-", "");
Map<String, Object> paramMap = new HashMap<>();
String appid = "";
if (paymentInfo.getAppName()==null||"".equals(paymentInfo.getAppName())){
appid = wechatPayConfig.getAppId();
}else if ("zmzm".equals(paymentInfo.getAppName())){
appid = wechatPayConfig.getZmzmappId();
}
Map<String, Object> map = new HashMap<>();
paramMap.put("appid", wechatPayConfig.getAppId());
paramMap.put("appid", appid);
map.put("noncestr", nonceStr);
map.put("package", "Sign=WXPay");
paramMap.put("mchid", wechatPayConfig.getMchId());
@@ -75,7 +81,7 @@ public class WeChatPayController {
map.put("prepayid", prepayId);
long timestamp = System.currentTimeMillis() / 1000;
map.put("timestamp", timestamp);
String sign = wxPayUtil.getSign(wechatPayConfig.getAppId(), timestamp, nonceStr, prepayId);
String sign = wxPayUtil.getSign(appid, timestamp, nonceStr, prepayId);
map.put("sign", sign);
Map<String, Object> result = new HashMap<>();
result.put("paramMap", paramMap);

4
src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java
View File

@@ -20,4 +20,8 @@ public class WechatPaymentInfo implements Serializable {
* 总金额
*/
private BigDecimal totalAmount;
/**
* appName
*/
private String appName;
}

8
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -73,8 +73,14 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
@Override
public void prepay(WechatPaymentInfo paymentInfo){
Map<String, Object> paramMap = new HashMap<>();
String appid = "";
if (paymentInfo.getAppName()==null||"".equals(paymentInfo.getAppName())){
appid = wechatPayConfig.getAppId();
}else if ("zmzm".equals(paymentInfo.getAppName())){
appid = wechatPayConfig.getZmzmappId();
}
// app id
paramMap.put("appid", wechatPayConfig.getAppId());
paramMap.put("appid", appid);
// 商户 id
paramMap.put("mchid", wechatPayConfig.getMchId());
// 描述