Browse Source

添加通云单号

yq 2 years ago
parent
commit
82cf6843af

+ 1 - 0
src/main/java/com/usky/dxtop/controller/web/business/TopNotifyController.java

@@ -77,6 +77,7 @@ public class TopNotifyController {
             if (null == order){
                 log.error("---订单回调"+"订单编号不存在");
             }else {
+                order.setOrderNo(orderNo);
                 callApiLogService.saveOrUpdate(merchantOrderNo,OrderServiceImpl.SCAN_PAY, topApiConfiger.scanPayUrl,null,JSONObject.toJSONString(tMap));
                 orderService.paySuccess(order);
             }

+ 6 - 0
src/main/java/com/usky/dxtop/model/Order.java

@@ -111,4 +111,10 @@ public class Order extends BaseEntity implements Serializable {
      */
     private BigDecimal realMoney;
 
+    /**
+     * 通云订单编号
+     */
+    private String orderNo;
+
+
 }

+ 1 - 0
src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -261,6 +261,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public void checkOrder(Order order,String result,String param){
         JSONObject obj= JSON.parseObject(result);
+        Optional.ofNullable(obj.get("orderNo")).ifPresent(orderNo -> order.setOrderNo(orderNo.toString()));
         if (null != obj.get("msg") && "交易订单不存在".equals(obj.get("msg").toString())){
             long datePoorMin = DateUtils.getDatePoorMin(DateUtils.getNowDate(), order.getCreateTime());
             if (datePoorMin > 31){