处理京东打单

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -19,10 +19,7 @@ import com.iamberry.rst.faces.address.AddressService;
 import com.iamberry.rst.faces.cm.InventoryService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
-import com.iamberry.rst.faces.order.EfastOrderService;
-import com.iamberry.rst.faces.order.OrderBatchService;
-import com.iamberry.rst.faces.order.OrderSyncLogService;
-import com.iamberry.rst.faces.order.OrderWarehouseService;
+import com.iamberry.rst.faces.order.*;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
@@ -118,8 +115,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Autowired
     private SysConfigService sysConfigService;
 
-    @Value("${jingdong.order.domain}")
-    private String jdOrderDomain;
+    @Autowired
+    private LogisticsInfoService logisticsInfoService;
+
+    private static String jdOrderDomain = "http://114.67.222.230:8088/watero";
 
     /**
      * 缓存订单项的前缀
@@ -2289,7 +2288,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
                     Map<String, String> params = new HashMap<>();
                     params.put("orderId", salesOrder.getSalesOrderId());
-                    params.put("logiCoprId", salesOrder.getSalesPostFirm());
+                    params.put("logiCoprId", logisticsInfoService.getLogisticsNameByRSTCode(salesOrder.getSalesPostFirm()).getLogisticsXytCode());
                     params.put("logiNo", o.getSalesPostNum());
                     params.put("code", AES.encrypt(salesOrder.getSalesOrderId()));
                     String result = HttpClient431Util.doPost(params, jdOrderDomain + "/jingdong/orderShipment");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/JingdongTask.java

@@ -281,6 +281,7 @@ public class JingdongTask {
      * @param logiNo
      */
     public OperatorResult orderShipment(String orderId, String logiCoprId, String logiNo){
+
         SysConfig sysConfigAll = sysConfigService.getSysConfigAll(27);
         JdClient client = new DefaultJdClient(JingdongConfig.JINGDONG_API_URL, sysConfigAll.getConfigParameter(), JingdongConfig.jd_appkey, JingdongConfig.jd_secret);
         PopOrderShipmentRequest req = new PopOrderShipmentRequest();

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

@@ -118,8 +118,7 @@ public class AwaitSendController {
     @Autowired
     private SalesOrderMapper salesOrderMapper ;
 
-    @Value("${jingdong.order.domain}")
-    private String jdOrderDomain;
+    private static String jdOrderDomain = "http://114.67.222.230:8088/watero";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);
 

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.iamberry.rst.core.order.EOrderRequestData;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
-import com.sun.org.apache.xml.internal.security.utils.Base64;
-
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -83,7 +81,7 @@ public class OrderUtils {
      * @throws UnsupportedEncodingException
      */
     private static String base64(String str, String charset) throws UnsupportedEncodingException {
-        return Base64.encode(str.getBytes(charset));
+        return null;
     }
 
     @SuppressWarnings("unused")