禁用 商铺出货

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinOrderSku.java

@@ -129,6 +129,8 @@ public class GoblinOrderSku implements Serializable,Cloneable {
 
     private LocalDateTime updatedAt;
 
+    private LocalDateTime pushTime;
+
     private String comment;
 
     private static final GoblinOrderSku obj = new GoblinOrderSku();

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreOrder.java

@@ -324,6 +324,8 @@ public class GoblinStoreOrder implements Serializable,Cloneable {
 
     private LocalDateTime updatedAt;
 
+    private LocalDateTime pushTime;
+
     private String comment;
 
     private static final GoblinStoreOrder obj = new GoblinStoreOrder();

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

@@ -85,9 +85,6 @@ goblin.store.market.delSpuRelation=UPDATE goblin_store_market_purchasing SET del
 goblin.self.market.insertRelation=INSERT INTO goblin_marketing_zhengzai (`zhengzai_id`,`self_market_id`,`spu_id`,`sku_id`,`store_id`,`price_marketing`,`stock_marketing`,`buy_factor`,`buy_roster`,`buy_limit`,`del_flag`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.self.market.updateRelation=UPDATE goblin_marketing_zhengzai SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE self_market_id =? and store_id =?
 goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
-#----                   \u8BA2\u5355\u521B\u5EFA&\u652F\u4ED8
-goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ?  WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u8BA2\u5355\u7ED1\u5B9A[\u6B63\u5728\u4E0B\u5355] \u51FA\u8D27
 goblin_order.zhengzai.bind=UPDATE goblin_store_order SET user_id = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -799,11 +799,13 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
                     storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     storeOrder.setZhengzaiStatus(1);
+                    storeOrder.setPushTime(now);
+                    orderVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 }
                 storeOrder.setUpdatedAt(now);
                 sqls.add(SqlMapping.get("goblin_order.pay.order"));
                 sqlDataOrder.add(new Object[]{
-                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
                         orderId, now, now
                 });
                 sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -816,6 +818,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
                     if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
                         orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                        orderSkuVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     }
                     //redis
                     redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo);
@@ -844,7 +847,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     mongoUtils.insertGoblinOrderLogVo(logVo);
                     //mysql
                     sqlDataSku.add(new Object[]{
-                            orderSkuVo.getStatus(), now,
+                            orderSkuVo.getStatus(), now,orderSkuVo.getStatus()==4?now:null,
                             orderSkuVo.getOrderSkuId(), now, now
                     });
                 }
@@ -1108,9 +1111,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     storeOrder.setZhengzaiStatus(1);
                     storeOrder.setUpdatedAt(now);
+                    storeOrder.setPushTime(now);
                     sqls.add(SqlMapping.get("goblin_order.pay.order"));
                     sqlDataOrder.add(new Object[]{
-                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
                             orderId, now, now
                     });
                     sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -1147,7 +1151,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                         mongoUtils.insertGoblinOrderLogVo(logVo);
                         //mysql
                         sqlDataSku.add(new Object[]{
-                                orderSkuVo.getStatus(), now,
+                                orderSkuVo.getStatus(), now,now,
                                 orderSkuVo.getOrderSkuId(), now, now
                         });
                     }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -617,7 +617,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             storeOrder.setUpdatedAt(now);
             sqls.add(SqlMapping.get("goblin_order.pay.order"));
             sqlDataOrder.add(new Object[]{
-                    storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                    storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(), null,
                     orderId, now, now
             });
             sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -654,7 +654,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
 
                 //mysql
                 sqlDataSku.add(new Object[]{
-                        GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now,
+                        GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now, orderSkuVo.getStatus() == 4 ? now : null,
                         orderSkuVo.getOrderSkuId(), now, now
                 });
             }

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

@@ -36,8 +36,8 @@ goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`ord
 #----                   \u518D\u6B21\u652F\u4ED8
 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)
 #----                   \u8BA2\u5355\u521B\u5EFA&\u652F\u4ED8
-goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ?  WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ?,push_time = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? ,push_time = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundPrice=UPDATE goblin_store_order SET price_refund = ? ,status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,status = ? ,  updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? ,refund_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)