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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -99,8 +99,9 @@ public class GoblinStatusConst {
         BACK_REASON_TYPE_5(5, "不想买了"),
         BACK_REASON_TYPE_6(6, "商品质量问题"),
         BACK_REASON_TYPE_7(7, "收到商品与描述不符"),
-        BACK_REASON_TYPE_8(8, "商铺发起"),//todo
+        BACK_REASON_TYPE_8(8, "商铺发起"),
         BACK_REASON_TYPE_9(9, "系统自动申请"),
+        BACK_REASON_TYPE_10(10, "超时支付自动退款"),
 
         BACK_TYPE_1(1, "退款"),
         BACK_TYPE_2(2, "退货"),

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBackOrderVo.java

@@ -94,7 +94,7 @@ public class GoblinBackOrderVo implements Serializable, Cloneable {
     public GoblinBackOrderVo copy(GoblinBackOrder source) {
         this.setBackOrderId(source.getBackOrderId());
         this.setBackCode(source.getBackCode());
-        this.setOrderId(source.getBackOrderId());
+        this.setOrderId(source.getOrderId());
         this.setOrderCode(source.getOrderCode());
         this.setStoreId(source.getStoreId());
         this.setUserId(source.getUserId());

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/config/RedisStreamConfig.java

-package com.liquidnet.service.dragon.config;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RedisStreamConfig {
-
-//    @Autowired
-//    private RedisPayNotifyReceiver redisPayNotifyReceiver;
-
-//    @Bean
-//    public Subscription subscriptionAlipayNotify0(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_GROUP.getCode(), "alipay-pay-notify-0"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionAlipayNotify1(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_GROUP.getCode(), "alipay-pay-notify-1"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionWepayNotify0(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_GROUP.getCode(), "wepay-pay-notify-0"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionWepayNotify1(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_GROUP.getCode(), "wepay-pay-notify-1"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java

@@ -154,6 +154,9 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
             return ResponseDto.failure("无法查看");
         }
         GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
+        if(backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_0.getValue())){
+            return ResponseDto.failure("已经发起");
+        }
         backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_0.getValue());
         backOrderVo.setAuditAt(nowStr);
         //添加日志

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

@@ -349,7 +349,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         if (addressesVo == null) {
             storeOrder.setPriceExpress(BigDecimal.ZERO);
         } else {
-            storeOrder.setPriceExpress(BigDecimal.TEN);
+            storeOrder.setPriceExpress(BigDecimal.ZERO);
         }
         storeOrder.setPriceTotal(storeTotalPrice.add(storeOrder.getPriceExpress()));
         BigDecimal priceActual = storeOrder.getPriceTotal().subtract(voucherPrice).subtract(storeVoucherPrice);
@@ -901,7 +901,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             String orderId = backOrderVo.getOrderId();
             List<GoblinBackOrderSkuVo> backOrderSkuVos = backOrderVo.getBackOrderSkuVos();
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-            orderVo.setPriceRefund(orderVo.getPriceRefund().add(refundCallbackParam.getRefundPrice()));
+            orderVo.setPriceRefund(orderVo.getPriceRefund()==null?BigDecimal.ZERO:orderVo.getPriceRefund().add(refundCallbackParam.getRefundPrice()));
             if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) >= 0) {
                 //整单退款 退券
                 orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());

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

@@ -296,7 +296,11 @@ public class GoblinOrderUtils {
 
 
     //超时支付自动退款
-    public Boolean refundOrderSku(String orderId, String paymentId,String paymentType) {
+    public Boolean refundOrderSku(String orderId, String paymentId, String paymentType) {
+        int autoSize = redisUtils.getBackOrderByOrderId(orderId).size();
+        if (autoSize > 0) {
+            return true;
+        }
         String uid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.getNowTime();
@@ -329,7 +333,7 @@ public class GoblinOrderUtils {
         goblinBackOrder.setUserId(orderVo.getUserId());
 //        goblinBackOrder.setSkuIdNums(orderSkuId);
         goblinBackOrder.setType(GoblinStatusConst.Type.BACK_TYPE_1.getValue());
-        goblinBackOrder.setReason(GoblinStatusConst.Type.BACK_REASON_TYPE_8.getDesc());
+        goblinBackOrder.setReason(GoblinStatusConst.Type.BACK_REASON_TYPE_10.getDesc());
         goblinBackOrder.setDescribes("超时支付自动退款");
         refundPrice = refundPrice.add(orderVo.getPriceExpress());
         goblinBackOrder.setRealBackPrice(refundPrice);