Merge branch 'hjc_bug_zhengzai_pay' into dev_bd_rm_consumer_od

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

@@ -116,8 +116,9 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                     return ResponseDto.failure("出货失败，活动不符");
                 }
                 storeOrderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                storeOrderVo.setZhengzaiStatus(1);
                 sqlDataOrder.add(new Object[]{
-                        storeOrderVo.getStatus(), now,
+                        storeOrderVo.getStatus(),storeOrderVo.getZhengzaiStatus(), now,
                         storeOrderVo.getOrderId(), now, now
                 });
                 List<String> skuIds = storeOrderVo.getOrderSkuVoIds();
@@ -195,7 +196,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 if (storeOrderVo.getUserId().equals(uid)) {
                     continue;
                 }
-                storeOrderVo.setUserId(orderId);
+                storeOrderVo.setUserId(uid);
                 priceActual = priceActual.add(storeOrderVo.getPriceActual());
                 //mongo
                 mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);

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

@@ -174,7 +174,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         //订单状态修改
         orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
         orderStatus.add(new Object[]{
-                orderVo.getStatus(), now,
+                orderVo.getStatus(), orderVo.getZhengzaiStatus(), now,
                 orderVo.getOrderId(), now, now
         });
         for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
@@ -186,7 +186,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             //mongo
             mongoUtils.updateGoblinOrderSkuVo(orderSkuVo.getOrderSkuId(), orderSkuVo);
             orderSkuStatus.add(new Object[]{
-                    orderSkuVo.getStatus(), now,
+                    orderSkuVo.getStatus(), 0,now,
                     orderSkuVo.getOrderSkuId(), now, now
             });
         }
@@ -300,7 +300,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             //订单状态修改
 //            orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_61.getValue());
             orderStatus.add(new Object[]{
-                    orderVo.getStatus(), now,
+                    orderVo.getStatus(), orderVo.getZhengzaiStatus(),now,
                     orderVo.getOrderId(), now, now
             });
             for (String orderSkuId : orderVo.getOrderSkuVoIds()) {

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

@@ -117,18 +117,19 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         } else {
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
+                storeOrderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                 storeOrderVo.setZhengzaiStatus(1);
                 //mongo
                 mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
                 //redis
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
                 sqlDataOrder.add(new Object[]{
-                        1, now, storeOrderVo.getOrderId(), now, now
+                        storeOrderVo.getZhengzaiStatus(),storeOrderVo.getStatus(), now, storeOrderVo.getOrderId(), now, now
                 });
             }
             //mysql
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
-                    SqlMapping.get("goblin_order.zhengzai.bind", sqlDataOrder));
+                    SqlMapping.get("goblin_order.zhengzai.push", sqlDataOrder));
         }
         return ResponseDto.success();
     }

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

@@ -90,7 +90,7 @@ goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_i
 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 = ? ,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)
 #----                   \u5546\u94FA\u8BA2\u5355\u64CD\u4F5C
 goblin_order.store.cancel=UPDATE goblin_store_order SET status = ? ,cancel_time = ? , cancel_reason = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderSkuStatus=UPDATE goblin_order_sku SET status = ? , updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
@@ -107,7 +107,7 @@ goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`bac
 goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , refuse_at=?,refuse_size=?,updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? ,zhengzai_status=?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?,audit_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u7528\u6237\u8BA2\u5355\u64CD\u4F5C
 goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`logis_company_name`,`mail_no`,`pics`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)

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

@@ -794,6 +794,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 } else {
                     storeOrder.setWriteOffCode("");
                 }
+                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.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
                 storeOrder.setUpdatedAt(now);
                 sqls.add(SqlMapping.get("goblin_order.pay.order"));