优化代码

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -398,7 +398,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         shopMap.put("condValue",shopIds);
         conditionTypeList.add(shopMap);
 
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
         Integer amountAllNum = 0;   //同步总数量
         Integer amountSuccessAllNum = 0;   //同步成功总数量
         String batchId = ""; //批次id
@@ -498,7 +498,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         try {
             JSONObject jsonObj = new JSONObject(json);//转化为json格式
             String resultMsg = jsonObj.getString("result_msg");
-            if(resultMsg.equals("success")) {
+            if("success".equals(resultMsg)) {
                 JSONObject dataObj = jsonObj.getJSONObject("data");    //数据
                 JSONArray beanListArray = dataObj.getJSONArray("beanList");
                 if (beanListArray.length() > 0) {
@@ -521,12 +521,13 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                         }
 
                         //订单状态::0 待支付；10 待成团；20 待发货；30 预售中；40 待审批；50 仓库代发货；60 已发货；70 已签收；80 已拒收；999 已作废
-                        Integer orderStatus = infoObj.getInt("orderStatus");
+                        int orderStatus = infoObj.getInt("orderStatus");
                         if (60 == orderStatus || orderStatus == 70) {
                             JSONArray logisticsArray = null;
                             if(job.has("logistics")){
                                 logisticsArray = job.getJSONArray("logistics");
                             }
+                            assert logisticsArray != null;
                             if(logisticsArray.length() < 1){
                                 errorMsg.append("该订单发货异常!");
                                 flag = false;
@@ -541,11 +542,18 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             SalesOrder so = new SalesOrder();
                             switch (companyCode){
                                 case "2087":{
-                                    so.setSalesPostFirm("jd"); //快递公司
+                                    //快递公司
+                                    so.setSalesPostFirm("jd");
+                                    break;
+                                }
+                                case "CYS0000010":{
+                                    //快递公司
+                                    so.setSalesPostFirm("jd");
                                     break;
                                 }
                                 case "STO":{
-                                    so.setSalesPostFirm("STO"); //快递公司
+                                    //快递公司
+                                    so.setSalesPostFirm("STO");
                                     break;
                                 }
                                 default:{
@@ -553,7 +561,8 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                     break;
                                 }
                             }
-                            so.setSalesPostNum(deliveryNo);   //快递单号
+                            //快递单号
+                            so.setSalesPostNum(deliveryNo);
                             so.setSalesId(salesId);
                             so.setSalesStatus(1);
                             so.setSalesShippingStatus(1);
@@ -1302,8 +1311,8 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             receiverCity = consigneeObj.getString("receiverCity");//市
                             receiverDistrict = consigneeObj.getString("receiverCountry");//区
                             receiverAddress = consigneeObj.getString("receiverAddress");//地址
-                            if(receiverState.indexOf("上海")>-1 || receiverState.indexOf("北京")>-1
-                                    || receiverState.indexOf("重庆")>-1 || receiverState.indexOf("天津")>-1 ){
+                            if(receiverState.contains("上海") || receiverState.contains("北京")
+                                    || receiverState.contains("重庆") || receiverState.contains("天津")){
                                 receiverDistrict = receiverCity;
                                 receiverCity = receiverState;
                             }
@@ -1894,11 +1903,11 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
      * @param orderId
      * @return
      */
-    private String syncOrderOnce(String orderId) {
+    public String syncOrderOnce(String orderId) {
         Map<String,Object> map = new HashMap<>();
-        map.put("orderId",orderId);//原始订单号
-        String json = this.syncXYT("IOrderService.query",map);
-        return json;
+        //原始订单号
+        map.put("orderId",orderId);
+        return this.syncXYT("IOrderService.query",map);
     }
 
     /**
@@ -1909,12 +1918,16 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
      */
     private String syncXYT(String type, Map<String,Object> paramsMap) {
         switch (type){
-            case "IOrderService.query":{ //订单查询
-                paramsMap.put("fullMode",false);   //fullMode Boolean 是 是否查询全部信息
-                paramsMap.put("includeArchive",false); //includeArchive Boolean 是 是否查询三个月前历史订单
+            case "IOrderService.query":{
+                //订单查询
+                //fullMode Boolean 是 是否查询全部信息
+                paramsMap.put("fullMode",false);
+                //includeArchive Boolean 是 是否查询三个月前历史订单
+                paramsMap.put("includeArchive",false);
                 break;
             }
-            case "delivery":{   //订单发货
+            case "delivery":{
+                //订单发货
                 break;
             }
             default:{
@@ -1923,8 +1936,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         }
         OrderSyncPlatform orderSyncPlatform = getXYTPlatform();
         JSONObject jsonObject = this.syncXYTFormat(type,paramsMap,orderSyncPlatform);
-        String rspJson = doPost(jsonObject,orderSyncPlatform.getSyncPlatApi());
-        return rspJson;
+        return doPost(jsonObject,orderSyncPlatform.getSyncPlatApi());
     }
 
     /**