新增上朵德邦的快递打印功能

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -267,6 +267,11 @@ public class AwaitSendController {
             //德邦 (360特惠件)
             eOrderRequestData.CustomerName = ("651476854");
             eOrderRequestData.ExpType = ("2");
+        } else if (post.equalsIgnoreCase("SDDB")) {
+            // 上朵德邦（标准快递）
+            eOrderRequestData.CustomerName = ("S20140809-60390596");
+            eOrderRequestData.ExpType = ("1");
+            eOrderRequestData.ShipperCode = "DBL";
         }
         LOGGER.info( "===salesId:" + salesId + "快递方式：" + post+ "订单编号:"+ orderId);
         // 收件人信息
@@ -274,6 +279,7 @@ public class AwaitSendController {
         if (addrs.length <= 3) {
             addrs = salesOrderInfo.getSalesAddressInfo().split("-");
         }
+        String addrDetails = salesOrderInfo.getSalesAddressInfo().substring(addrs[0].length() + addrs[1].length() + addrs[2].length() + 3);
         // 获取收件人邮编
         String postCode = AddrUtil.getPostCode(addrs[2]);
         if (postCode == null || "".equals(postCode)) {
@@ -289,7 +295,7 @@ public class AwaitSendController {
         receiver.put("ProvinceName", AddrUtil.dealProvince(addrs[0]));
         receiver.put("CityName", addrs[1]);
         receiver.put("ExpAreaName", addrs[2]);
-        receiver.put("Address", salesOrderInfo.getSalesAddressInfo());
+        receiver.put("Address", addrDetails);
         receiver.put("PostCode", postCode);
         eOrderRequestData.Receiver = (receiver);
         // 发件人信息
@@ -311,12 +317,12 @@ public class AwaitSendController {
         Double colorIsWeight = 0.00;
         StringBuilder goodName = new StringBuilder();
         // 2018-12-21 增加打印面单需求：判断是否为维修机
-        if (salesOrderInfo.getSalesCustomerId() != null) {
+        /*if (salesOrderInfo.getSalesCustomerId() != null) {
             CustomerInfo customerInfo = customerService.getCustomerInfo(salesOrderInfo.getSalesCustomerId());
             if (customerInfo != null && customerInfo.getCustomerIsSolve() != null && customerInfo.getCustomerIsSolve() == 4) {
                 goodName.append("【原机返回】");
             }
-        }
+        }*/
         int Goodsquantity = 0;
         for (SalesOrderItem temp : items) {
             goodName.append(temp.getProductAbbreviation())
@@ -352,7 +358,7 @@ public class AwaitSendController {
 
                 // 订单发货
                 SalesOrder salesOrder = new SalesOrder();
-                salesOrder.setSalesPostFirm(eOrderRequestData.ShipperCode);
+                //salesOrder.setSalesPostFirm(eOrderRequestData.ShipperCode);
                 salesOrder.setSalesPostNum(code);
                 salesOrder.setSalesShippingStatus(1);
                 salesOrder.setSalesSendTime(new Date());