Merge branch 'test'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -165,7 +165,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             hBody.put("jAddress", jAddress);
 
             // TODO: 2021/6/30 前端选择
-            hBody.put("payMethod", 0);// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
+            hBody.put("payMethod", 2);// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
             hBody.put("expressType", expressType);// 顺丰特快
 
             hBody.put("depositumInfo", depositumInfo);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -324,11 +324,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
             KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
             kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length()-10));
-            kylinOrderRefundsVoBase.setRefundCode(kylinOrderRefundsVoBase.getRefundCode().substring(kylinOrderRefundsVoBase.getRefundCode().length()-10));
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
             vo.setOrderTicketVo(orderTicketVo);
             return ResponseDto.success(vo);
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get("20030"));
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -33,7 +33,7 @@
 20028=订单已失效
 20027=您已支付请刷新再试
 20029=未选择支付方式
-20030=无权查看
+20030=查看失败
 
 #APP PARTNER
 20101=添加失败

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

@@ -125,8 +125,8 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
     }
 
     public boolean orderRoute(@RequestBody String params) {
-//        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
-        if (true) {
+        boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
+        if (res) {
             PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
             KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
             String orderExpressRouteId = IDGenerator.nextSnowId();