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

团购卷回调 支付时间回填

Browse Source
This commit is contained in:
wangw
2024-05-20 16:24:43 +08:00
parent 6991cbaa00
commit 30ee2b1b86
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.chaozhanggui.system.cashierservice.interceptor.RequestWrapper;
import com.chaozhanggui.system.cashierservice.service.PayService;
import com.chaozhanggui.system.cashierservice.util.DateUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
@@ -81,7 +83,8 @@ public class NotifyController {
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;
@@ -95,7 +98,7 @@ public class NotifyController {
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);
return payService.callBackGroupPay(orderNo, DateUtils.getTime(new Date()));
}
}
return null;

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

@@ -764,7 +764,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 "订单信息不存在";
@@ -782,6 +782,7 @@ public class PayService {
//修改主单状态
orderInfo.setStatus("unused");
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPayTime(DateUtils.fomatDateTime(payTime));
tbGroupOrderInfoMapper.update(orderInfo);
return "SUCCESS";
}else {