记得上下班打卡 | git大法好,push需谨慎

Commit d4ea3967 authored by jiangxiulong's avatar jiangxiulong

退款admin申请和取消、kylin和order的超时支付申请;更新orderTicketEntities 换方式 不然导致refundPrice 更新为0...

退款admin申请和取消、kylin和order的超时支付申请;更新orderTicketEntities 换方式 不然导致refundPrice 更新为0 因为那个vo设置了getRefundPrice方法
parent 7b639ae5
...@@ -135,14 +135,10 @@ public class KylinRefundsStatusServiceImpl { ...@@ -135,14 +135,10 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>() kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
.eq("order_ticket_entities_id", v)); .eq("order_ticket_entities_id", v));
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo(); mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
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(
Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(), Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(),
entitiesObject, new Document("$set", new Document("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER) .append("updatedAt", DateUtil.getNowTime()))
); );
dataUtils.delOrderTicketEntitiesRedis(v); dataUtils.delOrderTicketEntitiesRedis(v);
...@@ -286,14 +282,10 @@ public class KylinRefundsStatusServiceImpl { ...@@ -286,14 +282,10 @@ public class KylinRefundsStatusServiceImpl {
.eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2) .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
); );
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo(); mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
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(
Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(), Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
entitiesObject, new Document("$set", new Document("isPayment", newIsPayment)
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER) .append("updatedAt", DateUtil.getNowTime()))
); );
dataUtils.delOrderTicketEntitiesRedis(entitiesId); dataUtils.delOrderTicketEntitiesRedis(entitiesId);
......
...@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.utils.QueueUtils; ...@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.utils.QueueUtils;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bson.Document;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -86,14 +87,12 @@ public class KylinRefundsStatusServiceImpl { ...@@ -86,14 +87,12 @@ public class KylinRefundsStatusServiceImpl {
entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2); entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
entitiesTable.setUpdatedAt(time); 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( mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)).getQueryObject(), 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); dataUtils.delOrderTicketEntitiesRedis(orderEntitiesId);
orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderInfo.getOrderTicketsId(), null); orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderInfo.getOrderTicketsId(), null);
...@@ -248,15 +247,12 @@ public class KylinRefundsStatusServiceImpl { ...@@ -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( mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)).getQueryObject(), 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); dataUtils.delOrderTicketEntitiesRedis(orderEntitiesId);
// 退款明细 // 退款明细
......
...@@ -20,6 +20,7 @@ import com.liquidnet.service.order.utils.QueueUtils; ...@@ -20,6 +20,7 @@ import com.liquidnet.service.order.utils.QueueUtils;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bson.Document;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -95,11 +96,6 @@ public class KylinRefundsStatusServiceImpl { ...@@ -95,11 +96,6 @@ public class KylinRefundsStatusServiceImpl {
entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2); entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
entitiesTable.setUpdatedAt(nowTime); 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(); LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
LocalDateTime now1 = LocalDateTime.now(); LocalDateTime now1 = LocalDateTime.now();
for (String v : ticketEntityIds) { for (String v : ticketEntityIds) {
...@@ -109,8 +105,10 @@ public class KylinRefundsStatusServiceImpl { ...@@ -109,8 +105,10 @@ public class KylinRefundsStatusServiceImpl {
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(), 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); dataUtils.delOrderTicketEntitiesRedis(v);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment