Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

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

@@ -204,7 +204,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             // 防止重复前面加上 "NEW" 因取消后再发起订单号也不能一致所以直接使用orderExpressId
             String OrderExpressCode = "NOW" + orderExpressId;
             kylinOrderExpressPre.setOrderExpressCode(OrderExpressCode);
-            kylinOrderExpressPre.setExpressType(expressType);
+            kylinOrderExpressPre.setExpressType(Integer.valueOf(orderStatus.getProduceCode()));
             kylinOrderExpressPre.setCreatedAt(DateUtil.getNowTime());
             kylinOrderExpressPre.setPerformancesId(Relations.getPerformanceId());
             kylinOrderExpressPre.setExpressContacts(orderInfo.getExpressContacts());
@@ -230,7 +230,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                 hBody.put("payMethod", "2");
             }
 
-            hBody.put("expressType", expressType.toString());// 顺丰特快
+            hBody.put("expressType", orderStatus.getProduceCode());// 顺丰特快
 
             hBody.put("depositumInfo", depositumInfo);
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java

@@ -25,7 +25,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     Integer expressType;
     // 标快 特快
     Integer productCode;
-    Integer productTitle;
+    String productTitle;
 
     String orderExpressId;
     String mailno;