dragon 平台 保存订单id

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/SyncOrderParam.java

@@ -19,6 +19,8 @@ public class SyncOrderParam implements Cloneable {
     private String paymentId;
     @ApiModelProperty(value = "orderCode")
     private String orderCode;
+    @ApiModelProperty(value = "orderCodeId")
+    private String orderCodeId;
     @ApiModelProperty(value = "price")
     private BigDecimal price;
     @ApiModelProperty(value = "paymentType")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppOrderServiceImpl.java

@@ -291,6 +291,7 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
             httpData.add("name", redisUtils.getStoreInfoVo(storeParam.getStoreId()).getStoreName());
             httpData.add("detail", skuName);
             httpData.add("orderCode", storeOrder.getOrderCode());
+            httpData.add("orderId", storeOrder.getOrderId());
             httpData.add("clientIp", storeOrder.getIpAddress());
             httpData.add("notifyUrl", synUrl);
             httpData.add("createDate", storeOrder.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -423,6 +424,7 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
             httpData.add("name", redisUtils.getStoreInfoVo(storeOrderVo.getStoreId()).getStoreName());
             httpData.add("detail", "查找最初订单");
             httpData.add("orderCode", storeOrderVo.getOrderCode());
+            httpData.add("orderId", storeOrderVo.getOrderId());
             httpData.add("clientIp", storeOrderVo.getIpAddress());
             httpData.add("notifyUrl", synUrl);
             httpData.add("createDate", storeOrderVo.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -470,7 +472,7 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
         //支付时间
         LocalDateTime now = LocalDateTime.now();
         String timePay = syncOrderParam.getPaymentAt();
-        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(syncOrderParam.getOrderId());
+        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(syncOrderParam.getOrderCodeId());
         if (orderVo == null) {
             log.error("订单号：" + syncOrderParam.getOrderCode() + " 订单不存在");
             return "fail";//订单不存在
@@ -488,7 +490,14 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlDataSku = CollectionUtil.linkedListObjectArr();
-        return null;
+        if (orderVo.getStatus() == GoblinStatusConst.OrderStatus.ORDER_STATUS_5.getValue() && syncOrderParam.getStatus().equals(1)) {
+            log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
+        } else if ((orderVo.getStatus() == GoblinStatusConst.OrderStatus.ORDER_STATUS_6.getValue() || orderVo.getStatus() == GoblinStatusConst.OrderStatus.ORDER_STATUS_7.getValue()) && syncOrderParam.getStatus().equals(1)) {
+            log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
+        } else if (syncOrderParam.getStatus().equals(1)) {
+            log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
+        }
+        return "success";
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -13,6 +13,8 @@ goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag
 goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
 goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.pay.order = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.sku = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   再次支付
 goblin_order.pay.again = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   订单关闭
\ No newline at end of file