fix：“修复汇聚退款订单号过长导致退款失败问题”

src/main/java/com/szwl/controller/TOrderController.java

@@ -246,7 +246,7 @@ public class TOrderController {
             }
         } else {
             try {
-                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipmentId, refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
+                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipment.getClientId(), refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
                 if ("退款申请成功".equals(result)) {
                     order.setStatus(2);
                     if(StringUtils.isNotEmpty(order.getCoupons())){
@@ -459,7 +459,7 @@ public class TOrderController {
             }
         } else {
             try {
-                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipmentId, refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
+                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipment.getClientId(), refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
                 if ("退款申请成功".equals(result)) {
                     order.setStatus(2);
                     if(StringUtils.isNotEmpty(order.getCoupons())){
@@ -1048,7 +1048,7 @@ public class TOrderController {
         String payPlatform = order.getPayPlatform();
         if (StringUtils.isNotEmpty(payPlatform) && payPlatform.equals("1")) {
             try {
-                String refund = tShandeMchService.refund(order.getId(), orderService.initRefundSn(equipmentId, refundNumber).toString(), price, "", altRefInfo.toString());
+                String refund = tShandeMchService.refund(order.getId(), orderService.initRefundSn(equipment.getClientId(), refundNumber).toString(), price, "", altRefInfo.toString());
                 com.gexin.fastjson.JSONObject jsonObject =  com.gexin.fastjson.JSON.parseObject(refund);
                 String sub_code = jsonObject.getString("sub_code");
                 //订单号
@@ -1185,7 +1185,7 @@ public class TOrderController {
             }
         } else {
             try {
-                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipmentId, refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
+                String result = orderService.refund(order.getSn(), orderService.initRefundSn(equipment.getClientId(), refundNumber), refusePrice.subtract(p8_MarketRefAmount), p8_MarketRefAmount,"", notifyUrl, altRefInfo.toString());
                 if ("退款申请成功".equals(result)) {
                     order.setStatus(2);
                     if(StringUtils.isNotEmpty(order.getCoupons())){

src/main/java/com/szwl/service/TOrderService.java

@@ -22,7 +22,7 @@ public interface TOrderService extends MyIService<TOrder> {
      */
     String initSn(Long equipmentId);
 
-    Object initRefundSn(Long equipmentId, int refundNumber);
+    Object initRefundSn(String clientId, int refundNumber);
 
     String refund(String sn, Object o, BigDecimal price,BigDecimal p8_MarketRefAmount,String s, String notifyUrl, String s1);
 }

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -64,9 +64,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     }
 
     @Override
-    public Object initRefundSn(Long equipmentId, int refundNumber) {
+    public Object initRefundSn(String clientId, int refundNumber) {
         StringBuilder number = new StringBuilder();
-        if (equipmentId != null) {
+        if (clientId != null) {
             Random random = new Random();
             /**
              * 6位随机
@@ -77,7 +77,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             /**
              * 设备id
              */
-            number.append(equipmentId.toString());
+            number.append(clientId.substring(clientId.length() - 6));
             /**
              * 日期
              */