Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -227,12 +227,12 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             // 因此时间不会及时刷新，考虑到系统等问题，因为时间调整每晚12点刷新拉取时间
             Calendar endCreateTimeCalendar = Calendar.getInstance();
             endCreateTimeCalendar.setTime(orderSyncPlatform.getSyncOrderLastTime());
-            endCreateTimeCalendar.add(Calendar.DATE, 1);//增加一天
+            endCreateTimeCalendar.add(Calendar.DATE, 7);//增加7天
 
             //当前时间
             Calendar newDateCalendar = Calendar.getInstance();
 
-            if((endCreateTimeCalendar.get(Calendar.DAY_OF_MONTH)) != newDateCalendar.get(Calendar.DAY_OF_MONTH)){
+            if((endCreateTimeCalendar.get(Calendar.DAY_OF_MONTH)) < newDateCalendar.get(Calendar.DAY_OF_MONTH)){
                 newDateCalendar.set(Calendar.HOUR_OF_DAY,0);
                 newDateCalendar.set(Calendar.MINUTE,0);
                 newDateCalendar.set(Calendar.SECOND,0);
@@ -370,7 +370,9 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             JSONArray beanListArray = dataObj.getJSONArray("beanList");
             if(beanListArray.length() > 0){
                 JSONObject job = beanListArray.getJSONObject(0);
+
                 //为了避免小亚通同一个订单查询多次，将订单保存在MAP中
+                // 该map数据存活周期仅为一个选中打单发货，在AwaitSendController中，调用完了会直接清掉，这样数据不会重复，又能让每次重复的订单项快速查询
                 orderJsonMap.put(orderId,job);
                 return this.getIsShip(job,salesOrder);
             }
@@ -477,8 +479,10 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                 }
             }
             return allStatus;
-        }else{
-            if(999 == orderStatus){
+        }else if(60 == orderStatus || 70 == orderStatus || 80 == orderStatus ){   //该产品已发货
+            //如果该订单已发货，无需判断其他，直接return true
+            return true;
+        }else if(999 == orderStatus){ //实际应该不可能为0
                 //如果该订单已作废,那么本系统将跟随作废
                 SalesOrder so = new SalesOrder();
                 so.setSalesId(salesOrder.getSalesId());
@@ -492,10 +496,9 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                     orderTracking.setTrackingDesc("作废订单（发货验证-该订单已在第三方平台作废）");
                     salesOrderService.addTracking(orderTracking);
                 }
-            }
-            logger.info("小亚通调用检测该订单无法发货，该订单状态异常-订单状态："+getStatusMsg(orderStatus));
-            return false;
         }
+        logger.info("小亚通调用检测该订单无法发货，该订单状态异常-订单状态："+getStatusMsg(orderStatus));
+        return false;
     }
 
 
@@ -945,13 +948,16 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                         String salesUserRemark = "",SalesAdminRemark="";
                         //备注
                         if(job.has("memo")){
-                            String orderMemo = "",buyerMemo="",sellerMemo="",buyerMessage="";
+                            String orderMemo = "",buyerMemo="",sellerMemo="",buyerMessage="",sellerMessage="";
                             if(memoObj.has("orderMemo")){   //小亚通商家备注  -- 郜思琪
                                 orderMemo = memoObj.getString("orderMemo");
                             }
                             if(memoObj.has("sellerMemo")){  //天猫，淘宝，商家备注 -- 客服
                                 sellerMemo = memoObj.getString("sellerMemo");
                             }
+                            if(memoObj.has("sellerMessage")){  //京东商城，商家备注 -- 客服
+                                sellerMessage = memoObj.getString("sellerMessage");
+                            }
 
                             if(memoObj.has("buyerMemo")){   //买家留言，配送时间  -- 用户
                                 buyerMemo = memoObj.getString("buyerMemo");
@@ -960,7 +966,13 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                 buyerMessage = memoObj.getString("buyerMessage");
                             }
                             salesUserRemark = buyerMessage;
-                            SalesAdminRemark = orderMemo+"-"+sellerMemo;
+                            SalesAdminRemark = orderMemo;
+                            if(sellerMemo != null && !"".equals(sellerMemo)){
+                                SalesAdminRemark += "-"+sellerMemo;
+                            }
+                            if(sellerMessage != null && !"".equals(sellerMessage)){
+                                SalesAdminRemark += "-"+sellerMessage;
+                            }
                         }
                         salesOrder.setSalesUserRemark(salesUserRemark);//用户备注
                         salesOrder.setSalesAdminRemark(SalesAdminRemark);//后台的备注--卖家备注
@@ -1111,11 +1123,11 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                                     boolean isUpdate = false;
                                     SalesOrder updateMsgOrder = new SalesOrder();
                                     updateMsgOrder.setSalesExOrderId(so.getSalesExOrderId());
-                                    if(salesUserRemark.length() > 3){
+                                    if(salesUserRemark.length() > 4){
                                         updateMsgOrder.setSalesUserRemark(salesUserRemark);
                                         isUpdate = true;
                                     }
-                                    if(SalesAdminRemark.length() > 3){
+                                    if(SalesAdminRemark.length() > 4){
                                         updateMsgOrder.setSalesAdminRemark(SalesAdminRemark);
                                         isUpdate = true;
                                     }