Merge remote-tracking branch 'origin/jxl_422_nft_ya' into jxl_422_mongo_list

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

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

@@ -83,7 +83,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     return ResponseDto.failure("该商品当前状态不可购买～");
                 }
                 // 单独设置的售罄
-                if (null != skuVo.getSoldoutStatus() && skuVo.getSoldoutStatus().equals(1)) {
+                if (StringUtils.equals("1", skuVo.getSoldoutStatus())) {
                     return ResponseDto.failure("该商品已售罄～");
                 }
                 // 判断开售、停售时间
@@ -726,7 +726,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             //mongo
             goblinOrderUtils.setMongoList(GoblinNftOrderVo.class.getSimpleName(), "orderId", orderId, GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO, 2);
 //            goblinMongoUtils.updateGoblinNftOrderVo(nftOrder);
-            goblinMongoUtils.updateGoblinNftOrderRefundVo(nftOrderRefundVo);
+            HashMap<String, Object> updateRefundMdbMap = CollectionUtil.mapStringObject();
+            updateMdbMap.put("status", nftOrderRefundVo.getStatus());
+            updateMdbMap.put("refundAt", nftOrderRefundVo.getRefundAt());
+            updateMdbMap.put("updatedAt", nftOrderRefundVo.getUpdatedAt());
+            goblinMongoUtils.updateGoblinNftOrderRefundVo(nftOrderRefundVo.getOrderRefundId(), updateRefundMdbMap);
             //mysql
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();

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

@@ -10,6 +10,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
 
 @Component
@@ -113,11 +114,12 @@ public class GoblinMongoUtils {
     public void setGoblinNftOrderVo(GoblinNftOrderVo vo) {
         mongoTemplate.insert(vo, GoblinNftOrderVo.class.getSimpleName());
     }
-    public UpdateResult updateGoblinNftOrderVo(GoblinNftOrderVo data) {
-        BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
+
+    public UpdateResult updateGoblinNftOrderVo(String orderId, HashMap<String, Object> data) {
         return mongoTemplate.getCollection(GoblinNftOrderVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("orderId").is(data.getOrderId())).getQueryObject(),
-                object);
+                Query.query(Criteria.where("orderId").is(orderId)).getQueryObject(),
+                ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data))
+        );
     }
 
     //添加 订单退款数据
@@ -129,11 +131,11 @@ public class GoblinMongoUtils {
         return mongoTemplate.findOne(Query.query(Criteria.where("refundCode").is(refundCode)), GoblinNftOrderRefundVo.class, GoblinNftOrderRefundVo.class.getSimpleName());
     }
     //修改 订单退款数据
-    public UpdateResult updateGoblinNftOrderRefundVo(GoblinNftOrderRefundVo data) {
-        BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
+    public UpdateResult updateGoblinNftOrderRefundVo(String orderRefundId, HashMap<String, Object> data) {
         return mongoTemplate.getCollection(GoblinNftOrderRefundVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("orderRefundId").is(data.getOrderRefundId())).getQueryObject(),
-                object);
+                Query.query(Criteria.where("orderRefundId").is(orderRefundId)).getQueryObject(),
+                ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data))
+        );
     }
 
     /**