czg_team
/
wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf 

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
This commit is contained in:
韩鹏辉 2024-05-20 16:31:43 +08:00
parent 2c15439404 30ee2b1b86
commit 607b2b49e6
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
View File

@ -31,16 +31,16 @@ public class NotifyController {
@RequestMapping("memberInCallBack")
public String memberInCallBack(HttpServletRequest request){
public String memberInCallBack(HttpServletRequest request) {
Map<String, Object> map= getParameterMap(request);
log.info("回调返回信息:{}",JSONUtil.toJsonStr(map));
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"200".equals(map.get("code")+"")){
JSONObject object=JSONUtil.parseObj(map.get("data"));
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("status")&&"1".equals(object.getStr("status"))){
String orderNo=object.getStr("orderNumber");
String channelTradeNo=object.getStr("channelTradeNo");
return payService.minsuccess(orderNo,channelTradeNo);
Map<String, Object> map = getParameterMap(request);
log.info("回调返回信息:{}", JSONUtil.toJsonStr(map));
if (ObjectUtil.isNotEmpty(map) && map.containsKey("code") && "200".equals(map.get("code") + "")) {
JSONObject object = JSONUtil.parseObj(map.get("data"));
if (ObjectUtil.isNotEmpty(object) && object.containsKey("status") && "1".equals(object.getStr("status"))) {
String orderNo = object.getStr("orderNumber");
String channelTradeNo = object.getStr("channelTradeNo");
return payService.minsuccess(orderNo, channelTradeNo);
}
}
return null;
@ -101,21 +101,34 @@ public class NotifyController {
return null;
}
@RequestMapping("notifyCallBackGroup")
public String notifyCallBackGroup(HttpServletRequest request){
@RequestMapping("notifyCallBackGroupYsk")
public String notifyCallBackGroupYsk(HttpServletRequest request){
Map<String, Object> map= getParameterMap(request);
log.info("团购卷回调返回信息:{}",JSONUtil.toJsonStr(map));
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"200".equals(map.get("code")+"")){
JSONObject object=JSONUtil.parseObj(map.get("data"));
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("status")&&"1".equals(object.getStr("status"))){
String orderNo=object.getStr("orderNumber");
return payService.callBackGroupPay(orderNo);
String payTime = object.getStr("payTime");
return payService.callBackGroupPay(orderNo,payTime);
}
}
return null;
}
@RequestMapping("notifyCallBackGroup")
public String notifyCallBackGroup(HttpServletRequest request) {
Map<String, Object> map = getParameterMap(request);
log.info("团购卷回调返回信息:{}", JSONUtil.toJsonStr(map));
if (ObjectUtil.isNotEmpty(map) && map.containsKey("code") && "000000".equals(map.get("code") + "")) {
JSONObject object = JSONUtil.parseObj(map.get("bizData"));
if (ObjectUtil.isNotEmpty(object) && object.containsKey("state") && "TRADE_SUCCESS".equals(object.getStr("state"))) {
String orderNo = object.getStr("payOrderId");
return payService.callBackGroupPay(orderNo, DateUtils.getTime(new Date()));
}
}
return null;
}
private Map<String, Object> getParameterMap(HttpServletRequest request) {

5
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -340,7 +340,7 @@ public class PayService {
req.setTimestamp(System.currentTimeMillis());
req.setIp(ip);
req.setMercOrderNo(orderInfo.getOrderNo());
req.setNotifyUrl(callBackGroupurl);
req.setNotifyUrl(callBackGroupurl+"Ysk");
req.setPayAmt(payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
if (payType.equals("wechatPay")) {
req.setPayType("03");
@ -805,7 +805,7 @@ public class PayService {
}
@Transactional(rollbackFor = Exception.class)
public String callBackGroupPay(String payOrderNO) {
public String callBackGroupPay(String payOrderNO,String payTime) {
TbGroupOrderInfo orderInfo = tbGroupOrderInfoMapper.selectByPayOrderNo(payOrderNO);
if (ObjectUtil.isEmpty(orderInfo)) {
return "订单信息不存在";
@ -823,6 +823,7 @@ public class PayService {
//修改主单状态
orderInfo.setStatus("unused");
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPayTime(DateUtils.fomatDateTime(payTime));
tbGroupOrderInfoMapper.update(orderInfo);
return "SUCCESS";
}else {