Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderRefundEntitiesVo.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Data
 public class KylinOrderRefundEntitiesVo {
     private Integer mid;
-    private String orderRefundsEntities_id;
+    private String orderRefundsEntitiesId;
     private String orderRefundsId;
     private String orderTicketEntitiesId;
     private BigDecimal refundPrice;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderRefundsVo.java

@@ -5,36 +5,39 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class KylinOrderRefundsVo {
     private Integer mid;
-    private String order_refunds_id;
-    private String order_tickets_id;
-    private String order_refund_code;
-    private String order_refund_batches_id;
-    private String refund_code;
-    private LocalDateTime refund_at;
-    private String refund_id;
-    private String refund_error;
+    private String orderRefundsId;
+    private String orderTicketsId;
+    private String orderRefundCode;
+    private String orderRefund_batchesId;
+    private String refundCode;
+    private LocalDateTime refundAt;
+    private String refundId;
+    private String refundError;
     private BigDecimal price;
-    private BigDecimal price_express;
+    private BigDecimal priceExpress;
     private Integer status;
     private Integer type;
-    private String applicant_id;
-    private String applicant_name;
-    private LocalDateTime applicant_at;
+    private String applicantId;
+    private String applicantName;
+    private LocalDateTime applicantAt;
     private String reason;
-    private String auditor_id;
-    private String auditor_name;
-    private LocalDateTime auditor_at;
+    private String auditorId;
+    private String auditorName;
+    private LocalDateTime auditorAt;
     private String reject;
-    private String executor_id;
-    private String executor_name;
-    private LocalDateTime executor_at;
+    private String executorId;
+    private String executorName;
+    private LocalDateTime executorAt;
     private String refuse;
-    private Integer refund_type;
-    private String refund_cate;
-    private LocalDateTime created_at;
-    private LocalDateTime updated_at;
+    private Integer refundType;
+    private String refundCate;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVos;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -161,24 +161,27 @@ public class MongoVoUtils {
      * @param type    1新增 2修改
      * @param orderId 订单id [需要新增或者修改的订单id]
      */
-    public Boolean resetOrderListVo(String userId, Integer type, String orderId , KylinOrderTicketVo dataSingle) {
+    public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
         List<KylinOrderListVo> vo = new ArrayList<>();
         List<KylinOrderListVo> redisVo = new ArrayList();
         KylinOrderListVo voItem = new KylinOrderListVo();
         KylinOrderTicketVo data;
         if (dataSingle == null) {
-            data = dataUtils.getOrderTicketVo(orderId);
+            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
         } else {
             data = dataSingle;
         }
         BeanUtils.copyProperties(data, voItem);
-        redisVo.add(voItem);
-        List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
-        if (redisData.size() > 0) {
-            if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
-                redisData.remove(0);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if (type == 1) {
+            redisVo.add(voItem);
+            if (redisData.size() > 0) {
+                if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
+                    redisData.remove(0);
+                }
             }
         }
+
         redisVo.addAll(redisData);
 
         switch (type) {
@@ -190,13 +193,13 @@ public class MongoVoUtils {
                     if (i == 0) {
                         vo.add(voItem);
                     } else {
-                        vo.add(redisVo.get(i - 1));
+                        vo.add(redisVo.get(i));
                     }
                 }
                 if (redisVo.size() == 0) {
                     vo.add(voItem);
                 }
-                dataUtils.setOrderList(userId, vo);
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
                 return true;
             case 2:
                 for (int i = 0; i < redisVo.size(); i++) {
@@ -209,7 +212,7 @@ public class MongoVoUtils {
                         vo.add(redisVo.get(i));
                     }
                 }
-                dataUtils.setOrderList(userId, vo);
+                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
                 return true;
             default:
                 return false;