|
@@ -476,6 +476,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Integer syncXYTOrderOne(Integer type, String orderId) {
|
|
|
+ Integer flag = 0;
|
|
|
OrderSyncPlatform orderSyncPlatform = getXYTPlatform();
|
|
|
Map<String,Object> paramsMap = new HashMap<>();
|
|
|
List<Map<String,Object>> conditionTypeList = new ArrayList<>();
|
|
@@ -510,6 +511,12 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
if(status == 1){
|
|
|
amountAllNum+=amountNum;
|
|
|
amountSuccessAllNum+=amountSuccessNum;
|
|
|
+ if(amountSuccessNum > 0){
|
|
|
+ flag = 1;
|
|
|
+ }
|
|
|
+ if(amountNum == 0){
|
|
|
+ stringBuffer.append("该订单已存在");
|
|
|
+ }
|
|
|
}else{
|
|
|
stringBuffer.append(errorMsg);
|
|
|
}
|
|
@@ -529,7 +536,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
orderSyncLog.setSyncLogErrorMsg(newErrorMsg);
|
|
|
}
|
|
|
orderSyncLogMapper.save(orderSyncLog);
|
|
|
- return null;
|
|
|
+ return flag;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -994,6 +1001,17 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
memoObj = job.getJSONObject("memo");
|
|
|
}
|
|
|
|
|
|
+ SalesOrder salesOrder = new SalesOrder();
|
|
|
+
|
|
|
+ salesOrder.setSalesIsLocked(0);
|
|
|
+ salesOrder.setSalesIsSeparate(0);
|
|
|
+ salesOrder.setSalesAdminId(1);
|
|
|
+
|
|
|
+ salesOrder.setSalesIsSend(0);
|
|
|
+ salesOrder.setSalesDeliver(1);
|
|
|
+ salesOrder.setSalesShippingStatus(0);
|
|
|
+ salesOrder.setSalesStatus(1);
|
|
|
+
|
|
|
|
|
|
otherOrderId = infoObj.getLong("orderId");
|
|
|
|
|
@@ -1002,12 +1020,56 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
|
|
|
|
|
|
Integer orderStatus = infoObj.getInt("orderStatus");
|
|
|
- if(20 != orderStatus){
|
|
|
+ boolean isStatus = true;
|
|
|
+ switch (orderStatus){
|
|
|
+ case 20:
|
|
|
+ break;
|
|
|
+ case 60:
|
|
|
+ salesOrder.setSalesIsSend(1);
|
|
|
+ salesOrder.setSalesDeliver(2);
|
|
|
+ salesOrder.setSalesShippingStatus(1);
|
|
|
+ salesOrder.setSalesStatus(1);
|
|
|
+
|
|
|
+ JSONArray logisticsArray = null;
|
|
|
+ if(job.has("logistics")){
|
|
|
+ logisticsArray = job.getJSONArray("logistics");
|
|
|
+ }
|
|
|
+ if(logisticsArray.length() < 1){
|
|
|
+ errorMsg.append("商城订单编号:"+otherExtOrderId+"发货异常,未拉取到发货单号");
|
|
|
+ }else{
|
|
|
+ JSONObject logistics = logisticsArray.getJSONObject(0);
|
|
|
+ String companyCode = logistics.getString("companyCode");
|
|
|
+ String deliveryNo = logistics.getString("deliveryNo");
|
|
|
+ switch (companyCode){
|
|
|
+ case "2087":{
|
|
|
+ salesOrder.setSalesPostFirm("jd");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ case "STO":{
|
|
|
+ salesOrder.setSalesPostFirm("STO");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ default:{
|
|
|
+ salesOrder.setSalesPostFirm(companyCode);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ salesOrder.setSalesPostNum(deliveryNo);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case 999:
|
|
|
+ salesOrder.setSalesStatus(3);
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ isStatus = false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!isStatus){
|
|
|
errorMsg.append("商城订单编号:"+otherExtOrderId+"该订单状态异常,"+ getStatusMsg(orderStatus) +";");
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- SalesOrder salesOrder = new SalesOrder();
|
|
|
salesOrder.setSalesOrderId(String.valueOf(otherOrderId));
|
|
|
salesOrder.setSalesDealCode(String.valueOf(otherOrderId));
|
|
|
salesOrder.setSalesExOrderId(otherExtOrderId);
|
|
@@ -1224,15 +1286,6 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
salesOrder.setSalesWaitMoney(0);
|
|
|
salesOrder.setSalesSendType(2);
|
|
|
|
|
|
-
|
|
|
- salesOrder.setSalesIsSend(0);
|
|
|
- salesOrder.setSalesIsLocked(0);
|
|
|
- salesOrder.setSalesIsSeparate(0);
|
|
|
- salesOrder.setSalesStatus(0);
|
|
|
- salesOrder.setSalesShippingStatus(0);
|
|
|
- salesOrder.setSalesDeliver(1);
|
|
|
- salesOrder.setSalesAdminId(1);
|
|
|
-
|
|
|
Integer salesWarrantyStatus = 0;
|
|
|
List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
for(int j=0;j<itemsArray.length();j++){
|
|
@@ -1254,8 +1307,10 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
|
|
|
}
|
|
|
|
|
|
if(productColor.getColorIsJdAuto() == 1 && salesOrder.getSalesStoreId() == 40){
|
|
|
-
|
|
|
- salesOrder.setSalesStatus(4);
|
|
|
+ if(salesOrder.getSalesStatus() == 0){
|
|
|
+
|
|
|
+ salesOrder.setSalesStatus(4);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
Long orderItemId = item.getLong("orderItemId");
|