记得上下班打卡 | git大法好,push需谨慎

Commit b694ce5c authored by 张国柄's avatar 张国柄

opt;

parent 4d945685
...@@ -270,9 +270,21 @@ public class AdamMemberOrderController { ...@@ -270,9 +270,21 @@ public class AdamMemberOrderController {
@GetMapping("check") @GetMapping("check")
public ResponseDto<Integer> checkOrderResult(@NotBlank(message = "订单号不能为空") @RequestParam String orderNo) { public ResponseDto<Integer> checkOrderResult(@NotBlank(message = "订单号不能为空") @RequestParam String orderNo) {
AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo); AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
if (null == memberOrderInfo) {
List<AdamMemberOrderVo> memberOrderVos = adamRdmService.getMemberOrderVosByUid(CurrentUtil.getCurrentUid());
memberOrderInfo = adamRdmService.getMemberOrderVoByOrderNo(memberOrderVos, orderNo);
if (null != memberOrderInfo && memberOrderInfo.getState() == 1) {
return ResponseDto.success(1);
}
}
if (null == memberOrderInfo) { if (null == memberOrderInfo) {
return ResponseDto.failure(ErrorMapping.get("10211")); return ResponseDto.failure(ErrorMapping.get("10211"));
} }
if (memberOrderInfo.getMode() <= 1) { if (memberOrderInfo.getMode() <= 1) {
try { try {
// 支付中心返回说明:已支付订单status==1,未支付订单status==0 // 支付中心返回说明:已支付订单status==1,未支付订单status==0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment