监测回调

src/main/java/com/usky/dxtop/controller/web/TopNotifyController.java

@@ -5,6 +5,7 @@ import com.usky.dxtop.model.CallApiLog;
 import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.CallApiLogService;
 import com.usky.dxtop.service.OrderService;
+import com.usky.dxtop.service.api.TopApi;
 import com.usky.dxtop.service.impl.OrderServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.core.util.JsonUtils;
@@ -72,12 +73,7 @@ public class TopNotifyController {
         //填入回调信息
         try {
             log.info("---order---notify---接受到的参数"+JSONObject.toJSONString(tMap));
-            CallApiLog callApiLog = callApiLogService.one(merchantOrderNo, OrderServiceImpl.SCAN_PAY);
-            Optional.ofNullable(callApiLog)
-                    .ifPresent(cal -> {
-                        cal.setApiResultData(JSONObject.toJSONString(tMap));
-                        callApiLogService.update(cal);
-                    });
+            callApiLogService.saveOrUpdate(merchantOrderNo,OrderServiceImpl.SCAN_PAY, TopApi.SCAN_TO_PAY_URL,null,JSONObject.toJSONString(tMap));
             Order order = orderService.one(merchantOrderNo);
             if (null == order){
                 log.error("---order---notify"+"订单编号不存在");

src/main/java/com/usky/dxtop/service/CallApiLogService.java

@@ -23,11 +23,7 @@ public interface CallApiLogService extends IService<CallApiLog> {
      * @param result 结果
      * @return
      */
-    CallApiLog add(String orderNumber,String apiName,String url,String param,String result);
-
-
-
-    boolean update(CallApiLog callApiLog);
+    void saveOrUpdate(String orderNumber,String apiName,String url,String param,String result);
 
 
     CallApiLog one(String orderNumber,String apiName);

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * <p>
@@ -28,21 +29,17 @@ public class CallApiLogServiceImpl extends ServiceImpl<CallApiLogMapper, CallApi
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public CallApiLog add(String orderNumber, String apiName, String url, String param,String result) {
-        CallApiLog callApiLog = new CallApiLog();
-        callApiLog.setApiUrl(url);
-        callApiLog.setApiParam(param);
-        callApiLog.setOrderNumber(orderNumber);
-        callApiLog.setName(apiName);
-        callApiLog.setApiResultData(result);
-        this.save(callApiLog);
-        return callApiLog;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public boolean update(CallApiLog callApiLog) {
-        return this.updateById(callApiLog);
+    public void saveOrUpdate(String orderNumber, String apiName, String url, String param,String result) {
+        CallApiLog callApiLog = this.one(orderNumber, apiName);
+        if (null == callApiLog){
+            callApiLog = new CallApiLog();
+            callApiLog.setApiUrl(url);
+            callApiLog.setApiParam(param);
+            callApiLog.setOrderNumber(orderNumber);
+            callApiLog.setName(apiName);
+            callApiLog.setApiResultData(result);
+        }
+        this.saveOrUpdate(callApiLog);
     }
 
     @Override

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

@@ -135,7 +135,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 TopApi.signData(params));
         baseMapper.insert(order);
         //记录调用日志
-        callApiLogService.add(orderNumber,SCAN_PAY,TopApi.SCAN_TO_PAY_URL,JSONObject.toJSONString(params),null);
+        callApiLogService.saveOrUpdate(orderNumber,SCAN_PAY,TopApi.SCAN_TO_PAY_URL,JSONObject.toJSONString(params),null);
         return scanPayUrl;
     }
 
@@ -195,7 +195,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             b = false;
             log.error("---order---卡充值api调用异常"+ e.getMessage());
         }
-        callApiLogService.add(order.getOrderNumber(),CARD_TOP,TopApi.DEAL_SELECT_URL,JSONObject.toJSONString(param),result);
+        callApiLogService.saveOrUpdate(order.getOrderNumber(),CARD_TOP,TopApi.DEAL_SELECT_URL,JSONObject.toJSONString(param),result);
         if (b){
             //成功修改状态成功
             order.setOrderFlag(OrderStatus.SUCCESS.getCode());
@@ -245,13 +245,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 payError(order);
             }
         }
-        CallApiLog callApiLog = callApiLogService.one(order.getOrderNumber(), FIND_ORDER_INFO);
-        if (null == callApiLog){
-            callApiLogService.add(order.getOrderNumber(),FIND_ORDER_INFO,TopApi.DEAL_SELECT_URL,param,result);
-        }else {
-            callApiLog.setApiResultData(result);
-            callApiLogService.updateById(callApiLog);
-        }
+        callApiLogService.saveOrUpdate(order.getOrderNumber(), FIND_ORDER_INFO, TopApi.DEAL_SELECT_URL, param, result);
     }
 
     /**

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

@@ -27,22 +27,22 @@ public class OrderJob {
     @Autowired
     private OrderService orderService;
 
-    @Scheduled(cron = "0 */1 * * * ?")
-    public void execute(){
-        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper
-                .ne(Order::getPayType, OrderPayType.XJ.getPayCode())
-                .and(wrapper -> wrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
-                        .or()
-                        .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode()));
-        List<Order> list = orderService.list(queryWrapper);
-        for (Order order:list) {
-            try {
-                orderService.callTopFindOrderInfoApi(order.getOrderNumber());
-            }catch (Exception e){
-                log.error("---orderJob---异常"+e.getMessage());
-            }
-        }
-        log.info("---orderJob---处理完成");
-    }
+//    @Scheduled(cron = "0 */1 * * * ?")
+//    public void execute(){
+//        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper
+//                .ne(Order::getPayType, OrderPayType.XJ.getPayCode())
+//                .and(wrapper -> wrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
+//                        .or()
+//                        .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode()));
+//        List<Order> list = orderService.list(queryWrapper);
+//        for (Order order:list) {
+//            try {
+//                orderService.callTopFindOrderInfoApi(order.getOrderNumber());
+//            }catch (Exception e){
+//                log.error("---orderJob---异常"+e.getMessage());
+//            }
+//        }
+//        log.info("---orderJob---处理完成");
+//    }
 }