Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -135,14 +135,10 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
                     .eq("order_ticket_entities_id", v));
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-            kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
-            kylinOrderTicketEntitiesVo.setUpdatedAt(DateUtil.getNowTime());
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
+            mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(),
-                    entitiesObject,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                    new Document("$set", new Document("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                            .append("updatedAt", DateUtil.getNowTime()))
             );
 
             dataUtils.delOrderTicketEntitiesRedis(v);
@@ -286,14 +282,10 @@ public class KylinRefundsStatusServiceImpl {
                         .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
                 );
 
-                KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-                kylinOrderTicketEntitiesVo.setIsPayment(newIsPayment);
-                kylinOrderTicketEntitiesVo.setUpdatedAt(DateUtil.getNowTime());
-                BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-                Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
+                mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
-                        entitiesObject,
-                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                        new Document("$set", new Document("isPayment", newIsPayment)
+                                .append("updatedAt", DateUtil.getNowTime()))
                 );
 
                 dataUtils.delOrderTicketEntitiesRedis(entitiesId);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.utils.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -86,14 +87,12 @@ public class KylinRefundsStatusServiceImpl {
             entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
             entitiesTable.setUpdatedAt(time);
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
-            kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
-            kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
             mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)).getQueryObject(),
-                    entitiesObject
+                    new Document("$set", new Document("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                            .append("updatedAt", strTime))
             );
+
             dataUtils.delOrderTicketEntitiesRedis(orderEntitiesId);
 
             orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderInfo.getOrderTicketsId(), null);
@@ -248,15 +247,12 @@ public class KylinRefundsStatusServiceImpl {
 //            }
 
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
-            kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
-//            kylinOrderTicketEntitiesVo.setRefundPrice(oldRefundPrice.add(BigDecimal.valueOf(refundPrice)));
-            kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
             mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)).getQueryObject(),
-                    entitiesObject
+                    new Document("$set", new Document("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                            .append("updatedAt", strTime))
             );
+
             dataUtils.delOrderTicketEntitiesRedis(orderEntitiesId);
 
             // 退款明细

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

@@ -20,6 +20,7 @@ import com.liquidnet.service.order.utils.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -95,11 +96,6 @@ public class KylinRefundsStatusServiceImpl {
         entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
         entitiesTable.setUpdatedAt(nowTime);
 
-        KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
-        kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
-        kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
-        BasicDBObject entitiesObject = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-
         LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
         LocalDateTime now1 = LocalDateTime.now();
         for (String v : ticketEntityIds) {
@@ -109,8 +105,10 @@ public class KylinRefundsStatusServiceImpl {
 
             mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(),
-                    entitiesObject
+                    new Document("$set", new Document("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                            .append("updatedAt", nowTimeStr))
             );
+
             dataUtils.delOrderTicketEntitiesRedis(v);
         }