other_project/yxt_pay
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

支付相关

Browse Source
This commit is contained in:
dimengzhe
2024-01-08 11:59:01 +08:00
parent 5f6776c451
commit 49841ed70d
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/yxt/pay/biz/order/OrderService.java
View File

@@ -177,18 +177,18 @@ public class OrderService extends MybatisBaseService<OrderMapper, PayOrder> {
} else if (return_code.equalsIgnoreCase("SUCCESS")) { } else if (return_code.equalsIgnoreCase("SUCCESS")) {
String prepay_id = MapUtils.getString("prepay_id", resultUn); String prepay_id = MapUtils.getString("prepay_id", resultUn);
// 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5 // 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
resultObj.put("appId", wxPayVo.getAppId()); resultObj.put("appId", wxPayVo.getAppId());//appid
// resultObj.put("timeStamp", DateUtils.timeToStr(System.currentTimeMillis() / 1000, DateUtils.DATE_TIME_PATTERN)); // resultObj.put("timeStamp", DateUtils.timeToStr(System.currentTimeMillis() / 1000, DateUtils.DATE_TIME_PATTERN));
resultObj.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000)); resultObj.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
resultObj.put("nonceStr", nonceStr); resultObj.put("nonceStr", nonceStr);//随机字符串
// resultObj.put("package", "prepay_id=" + prepay_id); // resultObj.put("package", "prepay_id=" + prepay_id);
resultObj.put("package", "Sign=WXPay"); resultObj.put("package", "Sign=WXPay");//固定值
resultObj.put("partnerid", wxPayVo.getMchId()); resultObj.put("partnerid", wxPayVo.getMchId());//商户号
resultObj.put("signType", "MD5"); resultObj.put("signType", "MD5");
resultObj.put("prepayid", prepay_id); resultObj.put("prepayid", prepay_id);//预支付交易会话ID
String paySign = WechatUtil.arraySign(resultObj, wxPayVo.getSecret()); String paySign = WechatUtil.arraySign(resultObj, wxPayVo.getSecret());
// resultObj.put("paySign", paySign); // resultObj.put("paySign", paySign);
resultObj.put("sign", paySign); resultObj.put("sign", paySign);//签名
payOrder.setPayType(PayTypeEnum.WECHAT.getCode()); payOrder.setPayType(PayTypeEnum.WECHAT.getCode());
baseMapper.updateById(payOrder); baseMapper.updateById(payOrder);
return rb.success().setData(resultObj); return rb.success().setData(resultObj);
@@ -303,26 +303,22 @@ public class OrderService extends MybatisBaseService<OrderMapper, PayOrder> {
} }
String trade_state = MapUtils.getString("trade_state", resultUn); String trade_state = MapUtils.getString("trade_state", resultUn);
if ("SUCCESS".equals(trade_state)) { if ("SUCCESS".equals(trade_state)) {
payOrder.setState(2);
payOrder.setModifyTime(new Date());
baseMapper.updateById(payOrder);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
payOrder = fetchBySid(query.getMainSid()); String time_end = MapUtils.getString("time_end", resultUn);
/*payOrder = fetchBySid(query.getMainSid());
map.put("createTime", DateUtils.format(payOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); map.put("createTime", DateUtils.format(payOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
map.put("payTime", DateUtils.format(payOrder.getModifyTime(), "yyyy-MM-dd HH:mm:ss")); map.put("payTime", DateUtils.format(payOrder.getModifyTime(), "yyyy-MM-dd HH:mm:ss"));
map.put("outTradeNo", payOrder.getOutTradeNo()); map.put("outTradeNo", payOrder.getOutTradeNo());
map.put("mainSid", payOrder.getSid()); map.put("mainSid", payOrder.getSid());
map.put("trade_type", payOrder.getPayTypeValue());//交易类型 map.put("trade_type", payOrder.getPayTypeValue());//交易类型*/
map.put("trade_state", trade_state);
map.put("time_end", time_end);
return rb.success().setData(map); return rb.success().setData(map);
} else if ("USERPAYING".equals(trade_state)) {
} else { } else {
// 失败 // 失败
return rb.setMsg("查询失败,error=" + trade_state); return rb.setMsg("查询失败,error=" + trade_state);
} }
return null;
} }
} }