Merge branch 'dev-wyf-sqb-bug' into 'master'

收钱吧商品退款bug修复

See merge request !431

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

@@ -6,6 +6,7 @@ import com.liquidnet.common.third.sqb.param.response.data.CouponQueryData;
 import com.liquidnet.common.third.sqb.param.response.data.CouponRefundData;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
@@ -116,7 +117,7 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
 
     @Override
     public ResponseDto<Boolean> refund(String userId, String orderId, String reason) {
-        log.info("[收钱吧退款] 开始 userId={}, orderId={}", userId, orderId);
+        log.info("[收钱吧-退款] 开始 userId={}, orderId={}", userId, orderId);
 
         // 与详情接口一致：先主单 store + 商品，再收钱吧扩展；避免扩展单缺失却提示「订单不存在」
         GoblinStoreOrderVo storeOrderVo = goblinRedisUtils.getGoblinOrder(orderId);
@@ -182,6 +183,7 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
                     reason,
                     buildRequestId(IDGenerator.nextSnowId())
             );
+            log.info("[收钱吧-退款] 收钱吧退款响应: {}, orderId: {}.", JsonUtils.toJson(refundData), orderId);
             if (refundData == null) {
                 // 退款失败，回滚状态
                 orderVo.setUpdatedAt(LocalDateTime.now().format(DTF));
@@ -198,8 +200,8 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
             goblinSqbRedisUtils.setSqbOrder(orderId, orderVo);
             goblinRedisUtils.incrSkuStock(null, orderVo.getSkuId(), orderVo.getQuantity());
 
-            syncOrderStatus(orderId, 3);
-            log.info("[收钱吧退款] 退款成功，orderId={}", orderId);
+//            syncOrderStatus(orderId, 3);
+            log.info("[收钱吧-退款] 调用收钱吧退款成功，orderId={}", orderId);
             return ResponseDto.success(Boolean.TRUE);
 
         } catch (Exception e) {