支付订单解析处理

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -13,14 +13,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rabbitmq.client.LongString;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.core.page.CommonPage;
-import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.*;
 import com.usky.dxtop.common.utils.http.HttpUtils;
-import com.usky.dxtop.framework.web.domain.server.Sys;
 import com.usky.dxtop.mapper.OrderMapper;
 import com.usky.dxtop.model.*;
 import com.usky.dxtop.service.*;
@@ -33,13 +30,11 @@ import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.MapperFactory;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,7 +46,6 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -266,6 +260,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public void checkOrder(Order order,String result,String param){
         JSONObject obj= JSON.parseObject(result);
+        if (null != obj.get("msg") && "交易订单不存在".equals(obj.get("msg").toString())){
+            long datePoorMin = DateUtils.getDatePoorMin(DateUtils.getNowDate(), order.getCreateTime());
+            if (datePoorMin > 31){
+                cancelPay(order);
+            }
+            return;
+        }
         if ("0000".equals(obj.get("status").toString())){
             String trxstatus = obj.get("trxstatus").toString();
             //交易成功
@@ -701,7 +702,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             order.setUserName(staff.getName());
             order.setUserPhone(staff.getContacts());
             //判断卡同步成功
-            Assert.check(staff.getIsSuccess(),"人员未同步失败或同步失败，请手动同步人员信息");
+            Assert.check(staff.getIsSuccess(),"人员同步失败，请手动同步人员信息");
         }else {
             if (null != order.getChannelId() && 0 != order.getChannelId()){
                 TopChannel topChannel = topChannelService.getById(order.getChannelId());

src/main/java/com/usky/dxtop/service/job/OrderJob.java

@@ -27,11 +27,13 @@ public class OrderJob {
 
     public void execute(String param){
         for (Order order:getData(param)) {
-            try {
-                orderService.callTopFindOrderInfoApi(order.getOrderNumber());
-            }catch (Exception e){
-                log.error("---orderJob---异常"+"订单编号:"+order.getOrderNumber()+":"+e.getMessage());
-            }
+            orderService.callTopFindOrderInfoApi(order.getOrderNumber());
+//            try {
+//                orderService.callTopFindOrderInfoApi(order.getOrderNumber());
+//            }catch (Exception e){
+//                log.error("---orderJob---异常:"+e);
+//                log.error("---orderJob---异常"+"订单编号:"+order.getOrderNumber()+":"+e.getMessage());
+//            }
         }
     }