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

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

@@ -28,6 +28,8 @@ import java.util.List;
 @ApiModel
 public class KylinOrderRefundsVo implements Serializable,Cloneable {
 
+    private static final long serialVersionUID = 268172565273929795L;
+
     @ApiModelProperty(value = "主键ID")
     private String orderRefundsId;
 
@@ -167,10 +169,10 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
                     this.statusName = "退款失败";
                     break;
                 case 7:
-                    this.statusName = "二审通过等待退款";
+                    this.statusName = "财务通过等待退款";
                     break;
                 case 8:
-                    this.statusName = "二审驳回退款";
+                    this.statusName = "财务驳回退款";
                     break;
                 default:
                     this.statusName = "其他";

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -103,10 +103,10 @@ public class OrderRefundDao implements Serializable {
                 this.statusName="退款失败";
                 break;
             case 7:
-                this.statusName="二审通过等待退款";
+                this.statusName="财务通过等待退款";
                 break;
             case 8:
-                this.statusName="二审驳回退款";
+                this.statusName="财务驳回退款";
                 break;
             case 9:
                 this.statusName="已确认收货";

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefunds.java

@@ -18,9 +18,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinOrderRefunds implements Serializable {
+public class KylinOrderRefunds implements Serializable, Cloneable{
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 5901424962410128552L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Integer mid;

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

 package com.liquidnet.service.platform.service.refund;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.base.Joiner;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.UserPathDto;
@@ -82,61 +81,65 @@ public class KylinRefundsStatusServiceImpl {
 
     public boolean orderTicketRefunded(RefundCallbackParam refundCallbackParam, KylinOrderRefunds refundInfo) {
         List<KylinOrderRefundEntities> refundEntities = kylinOrderRefundsEntitiesMapper.selectList(
-                new QueryWrapper<KylinOrderRefundEntities>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
+                Wrappers.lambdaQuery(KylinOrderRefundEntities.class).eq(KylinOrderRefundEntities::getOrderRefundsId, refundInfo.getOrderRefundsId())
         );
         List<String> orderTicketEntitiesIdsArr = refundEntities.stream().map(KylinOrderTicketEntities -> KylinOrderTicketEntities.getOrderTicketEntitiesId()).collect(Collectors.toList());
         String orderTicketsId = refundInfo.getOrderTicketsId();
 
         KylinOrderTicketRelations orderRelations = kylinOrderTicketRelationsMapper.selectOne(
-                new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderTicketsId)
+                Wrappers.lambdaQuery(KylinOrderTicketRelations.class).eq(KylinOrderTicketRelations::getOrderId, orderTicketsId)
         );
 
         // 更新数据
         // 订单状态表
         KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
-                new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+                Wrappers.lambdaQuery(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, orderTicketsId)
         );
-        KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
+        KylinOrderTicketStatus orderStatusTable = KylinOrderTicketStatus.getNew();
         int newStatus = 0;
-        if (refundCallbackParam.getRefundPrice().add(refundInfo.getPriceCharges()).add(orderInfo.getPriceRefund()).add(orderInfo.getRefundPriceCharges()).compareTo(orderInfo.getPriceActual()) >= 0) {
+        int compareToRes = refundCallbackParam.getRefundPrice().add(refundInfo.getPriceCharges()).add(orderInfo.getPriceRefund()).add(orderInfo.getRefundPriceCharges()).compareTo(orderInfo.getPriceActual());
+        if (compareToRes == 0) {
             newStatus = KylinTableStatusConst.ORDER_STATUS4;
-        } else {
+        } else if (compareToRes < 0) {
             newStatus = KylinTableStatusConst.ORDER_STATUS6;
+        } else if (compareToRes > 0) {
+            log.info("refundCallback: 退款金额已大于实际支付金额，编号{}", refundInfo.getOrderTicketsId());
+            newStatus = KylinTableStatusConst.ORDER_STATUS4;
         }
         orderStatusTable.setStatus(newStatus);
         orderStatusTable.setUpdatedAt(LocalDateTime.now());
-        kylinOrderTicketStatusMapper.update(
-                orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
-                        .eq("order_id", orderTicketsId)
+        int update1 = kylinOrderTicketStatusMapper.update(
+                orderStatusTable,
+                Wrappers.lambdaUpdate(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, orderTicketsId)
         );
 
         // 入场人
         BigDecimal priceActual = orderInfo.getPriceActual();
         BigDecimal priceExpress = orderInfo.getPriceExpress();
         int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
-                new QueryWrapper<KylinOrderTicketEntities>()
-                        .eq("order_id", orderTicketsId)
-                        .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
+                Wrappers.lambdaQuery(KylinOrderTicketEntities.class)
+                        .eq(KylinOrderTicketEntities::getOrderId, orderTicketsId)
+                        .ne(KylinOrderTicketEntities::getIsPayment, KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
         );
         BigDecimal onePrice = priceActual.subtract(priceExpress).divide(BigDecimal.valueOf(allEntitiesCount));//单价
         int refundNumber = 0;
         for (String entitiesId : orderTicketEntitiesIdsArr) {
             KylinOrderTicketEntities EntitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(//已退完成的
-                    new QueryWrapper<KylinOrderTicketEntities>()
-                            .eq("order_ticket_entities_id", entitiesId)
+                    Wrappers.lambdaQuery(KylinOrderTicketEntities.class)
+                            .eq(KylinOrderTicketEntities::getOrderTicketEntitiesId, entitiesId)
             );
             BigDecimal refundedPrice = EntitiesInfo.getRefundPrice();
 
             KylinOrderRefundEntities refundEntitiesInfo = kylinOrderRefundsEntitiesMapper.selectOne(
-                    new QueryWrapper<KylinOrderRefundEntities>()
-                            .eq("order_refunds_id", refundInfo.getOrderRefundsId())
-                            .eq("order_ticket_entities_id", entitiesId)
+                    Wrappers.lambdaQuery(KylinOrderRefundEntities.class)
+                            .eq(KylinOrderRefundEntities::getOrderRefundsId, refundInfo.getOrderRefundsId())
+                            .eq(KylinOrderRefundEntities::getOrderTicketEntitiesId, entitiesId)
             );
 
-            KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
+            KylinOrderTicketEntities entitiesTable = KylinOrderTicketEntities.getNew();
             BigDecimal priceNew = refundEntitiesInfo.getRefundPrice().add(refundedPrice);
             int isPayment = 0;
-            if (priceNew.compareTo(onePrice) == 0) {
+            if (priceNew.compareTo(onePrice) >= 0) {
                 isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT3;
                 refundNumber++;
             } else {
@@ -144,11 +147,16 @@ public class KylinRefundsStatusServiceImpl {
             }
             entitiesTable.setIsPayment(isPayment);
             entitiesTable.setUpdatedAt(LocalDateTime.now());
+            if (priceNew.compareTo(onePrice) > 0) {
+                priceNew = onePrice;
+            }
             entitiesTable.setRefundPrice(priceNew);
             Integer[] entitiesTableIsPayment = {KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
-            kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
-                    .eq("order_ticket_entities_id", entitiesId)
-                    .in("is_payment", entitiesTableIsPayment)
+            kylinOrderTicketEntitiesMapper.update(
+                    entitiesTable,
+                    Wrappers.lambdaUpdate(KylinOrderTicketEntities.class)
+                            .eq(KylinOrderTicketEntities::getOrderTicketEntitiesId, entitiesId)
+                            .in(KylinOrderTicketEntities::getIsPayment, entitiesTableIsPayment)
             );
 
             HashMap<String, Object> EntitiesVo = new HashMap<>();
@@ -166,18 +174,21 @@ public class KylinRefundsStatusServiceImpl {
 
         // 订单表
         BigDecimal price = orderInfo.getPriceRefund().add(refundCallbackParam.getRefundPrice());
-        if (price.compareTo(orderInfo.getPriceActual()) == 1) {
+        if (compareToRes > 0) {
             price = orderInfo.getPriceActual();
         }
         Integer num = orderInfo.getRefundNumber() + refundNumber;
-        KylinOrderTickets update = new KylinOrderTickets();
+        if (num > orderInfo.getNumber()) {
+            num = orderInfo.getNumber();
+        }
+        KylinOrderTickets update = KylinOrderTickets.getNew();
         update.setRefundNumber(num);
         update.setPriceRefund(price);
         update.setUpdatedAt(LocalDateTime.now());
         update.setRefundPriceCharges(orderInfo.getRefundPriceCharges().add(refundInfo.getPriceCharges()));
-        kylinOrderTicketsMapper.update(
-                update, new UpdateWrapper<KylinOrderTickets>()
-                        .eq("order_tickets_id", orderTicketsId)
+        int update2 = kylinOrderTicketsMapper.update(
+                update,
+                Wrappers.lambdaUpdate(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, orderTicketsId)
         );
 
         HashMap<String, Object> orderVo = new HashMap<>();
@@ -195,19 +206,19 @@ public class KylinRefundsStatusServiceImpl {
         mongoVoUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId, null);
 
         // 退款单完成
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+        KylinOrderRefunds kylinOrderRefunds = KylinOrderRefunds.getNew();
         kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED);
         kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefundCode());
         kylinOrderRefunds.setRefundType(refundCallbackParam.getRefundType());
         kylinOrderRefunds.setRefundId(refundCallbackParam.getRefundId());
         kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefundAt());
         kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
-        kylinOrderRefundsMapper.update(
+        int update3 = kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundInfo.getOrderRefundsId())
+                Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundInfo.getOrderRefundsId())
         );
         // 修改缓存
-        KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
+        KylinOrderRefundsVo kylinOrderRefundsVo = KylinOrderRefundsVo.getNew();
         BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
         UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
@@ -217,11 +228,11 @@ public class KylinRefundsStatusServiceImpl {
         dataUtils.delOrderRefundVo(refundInfo.getOrderRefundsId());
         dataUtils.delOrderRefundVoByOrderId(refundInfo.getOrderTicketsId());
 
-        if (refundInfo.getType() != KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO) {
+        if (refundInfo.getType() != KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO && update3 > 0) {
             // 退还库存
             for (String entitiesId : orderTicketEntitiesIdsArr) {
                 KylinOrderTicketEntities entitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(
-                        new QueryWrapper<KylinOrderTicketEntities>().eq("order_ticket_entities_id", entitiesId)
+                        Wrappers.lambdaQuery(KylinOrderTicketEntities.class).eq(KylinOrderTicketEntities::getOrderTicketEntitiesId, entitiesId)
                 );
                 if (entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3) {
                     dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

 package com.liquidnet.service.platform.service.refund;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.HttpUtil;
@@ -8,6 +7,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
@@ -52,6 +52,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private KylinOrderRefundsMapper kylinOrderRefundsMapper;
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
+    @Autowired
+    private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
 
     @Autowired
     MongoTemplate mongoTemplate;
@@ -61,24 +63,32 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private DataUtils dataUtils;
 
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        log.info("订单退款回调参数：[RefundCallbackParam={}]", refundCallbackParam);
+        log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
-                new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getOrderRefundCode())
+                Wrappers.lambdaQuery(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundCode, refundCallbackParam.getOrderRefundCode())
         );
+
         if (refundInfo == null) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单查询失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL || refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已取消或已运营审核拒绝，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已取消，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已完成，编号{}", refundCallbackParam.getOrderRefundCode());
             return "success";
         }
 
+        /*KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(
+                Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, refundInfo.getOrderTicketsId())
+        );
+        if (kylinOrderTicketStatus.getStatus() == KylinTableStatusConst.ORDER_STATUS4) {
+            log.info("refundCallback: 票订单已完成退款，编号{}", refundInfo.getOrderTicketsId());
+            return "success";
+        }*/
+
         Integer status = refundCallbackParam.getStatus();
         if (1 == status) { // 退款成功
             boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
@@ -97,7 +107,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(
                     kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
+                    Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundInfo.getOrderRefundsId())
             );
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();