快递

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

@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderExpress;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +37,27 @@ import java.util.Map;
 @Slf4j
 public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpressMapper, KylinOrderExpress> implements IKylinOrderExpress {
 
+    @Value("${liquidnet.shunfeng.custid}")
+    private String custid;
+    @Value("${liquidnet.shunfeng.jCompany}")
+    private String jCompany;
+    @Value("${liquidnet.shunfeng.jContact}")
+    private String jContact;
+    @Value("${liquidnet.shunfeng.jMobile}")
+    private String jMobile;
+    @Value("${liquidnet.shunfeng.jProvince}")
+    private String jProvince;
+    @Value("${liquidnet.shunfeng.jCity}")
+    private String jCity;
+    @Value("${liquidnet.shunfeng.jAddress}")
+    private String jAddress;
+    @Value("${liquidnet.shunfeng.payMethod}")
+    private String payMethod;
+    @Value("${liquidnet.shunfeng.expressType}")
+    private String expressType;
+    @Value("${liquidnet.shunfeng.depositumInfo}")
+    private String depositumInfo;
+
     @Autowired
     MongoTemplate mongoTemplate;
 
@@ -57,7 +79,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
             voList = performancesMapper.performanceExpressPerformanceList(map);
         } catch (Exception e) {
-            return null;
         }
         return voList;
     }
@@ -68,7 +89,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
             voList = kylinOrderTicketsMapper.performanceExpressPerformanceOrderList(map);
         } catch (Exception e) {
-            return null;
         }
         return voList;
     }
@@ -80,28 +100,28 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
             );
             HashMap<String, Object> hBody = new HashMap<>();
-            hBody.put("orderId", orderInfo.getOrderCode());
 
-            hBody.put("jCompany", "摩登天空");
-            hBody.put("jContact", "姜秀龙");
+            hBody.put("custid", custid);
+            hBody.put("jCompany", jCompany);
+            hBody.put("jContact", jContact);
             // hBody.put("jTel", "010");
-            hBody.put("jMobile", "15811009011");
-            hBody.put("jProvince", "北京");
-            hBody.put("jCity", "北京市");
-            hBody.put("jAddress", "摩登天空");
-
-            hBody.put("dContact", "张红梅");
-            hBody.put("dMobile", "15010806631");
-            hBody.put("dProvince", "北京");
-            hBody.put("dCity", "北京市");
-            hBody.put("dAddress", "华通大厦");
-
-            hBody.put("custid", "7551234567");
-            hBody.put("payMethod", 0);// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
-            hBody.put("expressType", 1);// 顺丰特快
-
-            hBody.put("depositumInfo", "票");
-            hBody.put("depositumNo", 1);
+            hBody.put("jMobile", jMobile);
+            hBody.put("jProvince", jProvince);
+            hBody.put("jCity", jCity);
+            hBody.put("jAddress", jAddress);
+
+            hBody.put("payMethod", payMethod);// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
+            hBody.put("expressType", expressType);// 顺丰特快
+
+            hBody.put("depositumInfo", depositumInfo);
+
+            hBody.put("orderId", orderInfo.getOrderCode());
+            hBody.put("depositumNo", orderInfo.getNumber());
+            hBody.put("dContact", orderInfo.getExpressContacts());
+            hBody.put("dMobile", orderInfo.getExpressPhone());
+//            hBody.put("dProvince", "北京");
+//            hBody.put("dCity", "北京市");
+            hBody.put("dAddress", orderInfo.getExpressAddress());
 
             // 时间戳
             long currentTimeMillis = System.currentTimeMillis();

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -43,6 +43,16 @@ liquidnet:
       url: "https://butler-dev-ms.sf-express.com"
       sk: 21e9a70f677a2bf29dfa2b3bead4f018
       appid: 557104628450889728
+      custid: 7551234567
+      jCompany: 北京正在映画互联网有限公司
+      jContact: 姜秀龙
+      jMobile: 15811009011
+      jProvince: 北京
+      jCity: 北京市
+      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
+      payMethod: 0
+      expressType: 1
+      depositumInfo: 演出票
 
 # 开发环境配置
 server: