修改 超时支付

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

@@ -722,7 +722,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_5.getValue() && syncOrderParam.getStatus().equals(1)) {
                 log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
                 // 商铺退款逻辑
-                orderUtils.refundOrderSku(orderId);
+                orderUtils.refundOrderSku(orderId,syncOrderParam.getPaymentId());
 //                orderVo.setStatus(GoblinStatusConst.OrderStatus.ORDER_STATUS_61.getValue());
 //                redisUtils.setGoblinOrder(orderVo.getOrderId(),orderVo);
             } else if ((orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_6.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_7.getValue()) && syncOrderParam.getStatus().equals(1)) {

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

@@ -55,7 +55,7 @@ public class GoblinOrderUtils {
     //判断 数量限购
     public String judgeOrderLimit(String uid, String skuId, int number, int limitCount) {
         int buyCount = redisUtils.incrSkuCountByUid(uid, skuId, number);
-        if (buyCount  > limitCount) {
+        if (buyCount > limitCount) {
 //            redisUtils.decrSkuCountByUid(uid, skuId, number);
             return "已超出限购数量";
         } else {
@@ -296,7 +296,7 @@ public class GoblinOrderUtils {
 
 
     //超时支付自动退款
-    public Boolean refundOrderSku(String orderId) {
+    public Boolean refundOrderSku(String orderId, String paymentId) {
         String uid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.getNowTime();
@@ -345,6 +345,7 @@ public class GoblinOrderUtils {
         backOrderLog.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_2.getValue());
         backOrderLog.setMessage("商户发起[自动退款]：orderId=[" + orderId + "],refundPrice=[" + refundPrice + "],[refundCode=" + refundCode + "]");
         //调用退款
+        orderVo.setPaymentId(paymentId);
         String returnString = initRefund(orderVo, refundPrice, refundCode);
         HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
         Boolean success = (Boolean) hashMapResult.get("success");