callback

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -17,6 +18,7 @@ import com.liquidnet.service.kylin.utils.MongoVoUtils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
@@ -127,33 +129,27 @@ public class KylinRefundsStatusServiceImpl {
 
             KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
             double priceNew = refundEntitiesInfo.getRefundPrice().doubleValue() + refundedPrice.doubleValue();
+            int isPayment = 0;
             if (priceNew == onePrice) {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-                refundNumber ++;
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT3;
+                refundNumber++;
             } else {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
             }
+            entitiesTable.setIsPayment(isPayment);
             entitiesTable.setUpdatedAt(LocalDateTime.now());
-            // TODO: 2021/6/16  error
-            // entitiesTable.setRefundPrice(BigDecimal.valueOf(priceNew));
+            entitiesTable.setRefundPrice(BigDecimal.valueOf(priceNew));
             kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
                     .eq("order_ticket_entities_id", entitiesId)
                     .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
             );
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-            if (priceNew == onePrice) {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-            } else {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
-            }
-            kylinOrderTicketEntitiesVo.setUpdatedAt(LocalDateTime.now().toString());
-            kylinOrderTicketEntitiesVo.setRefundPrice(BigDecimal.valueOf(priceNew));
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
-                    entitiesObject,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
+                new Document("$set", new Document("updatedAt", DateUtil.getNowTime())
+                        .append("refundPrice", BigDecimal.valueOf(priceNew))
+                        .append("isPayment", isPayment)
+                )
             );
 
             dataUtils.delOrderTicketEntitiesRedis(entitiesId);
@@ -171,17 +167,13 @@ public class KylinRefundsStatusServiceImpl {
                         .eq("order_tickets_id", orderTicketsId)
         );
 
-        KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
-        kylinOrderTicketVoOrder.setStatus(newStatus);
-        kylinOrderTicketVoOrder.setRefundNumber(num);
-        kylinOrderTicketVoOrder.setUpdatedAt(LocalDateTime.now().toString());
-        // TODO: 2021/6/16  error
-        // kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
-        BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
-        Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+        UpdateResult orderUpdateResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
-                orderEntitiesObject,
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                new Document("$set", new Document("updatedAt", DateUtil.getNowTime())
+                        .append("priceRefund", BigDecimal.valueOf(price))
+                        .append("status", newStatus)
+                        .append("refundNumber", num)
+                )
         );
         dataUtils.delOrderTicketRedis(orderTicketsId);
         mongoVoUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId);