|
@@ -112,13 +112,20 @@ public class Ceb511Response {
|
|
wxMap.put("isCustomsSend",Contants.WX_SUCC);
|
|
wxMap.put("isCustomsSend",Contants.WX_SUCC);
|
|
wxOrderGrabService.updateMallOrderProcessRecord(wxMap);
|
|
wxOrderGrabService.updateMallOrderProcessRecord(wxMap);
|
|
|
|
|
|
|
|
+ Map<String, Object> reMap = new HashMap<>();
|
|
|
|
+ reMap.put("orderSn",wxOrder.getOrderSn());
|
|
if(CcnetContants.wsFlag.item_10.getItem().equals(wxOrder.getWsFlag())){
|
|
if(CcnetContants.wsFlag.item_10.getItem().equals(wxOrder.getWsFlag())){
|
|
- Map<String, Object> reMap = new HashMap<>();
|
|
|
|
- reMap.put("orderSn",wxOrder.getOrderSn());
|
|
|
|
reMap.put("orderStatus","300");
|
|
reMap.put("orderStatus","300");
|
|
reMap.put("shippingStatus","1");
|
|
reMap.put("shippingStatus","1");
|
|
- wxOrderGrabService.updateBuyerPayCheck(reMap);
|
|
|
|
|
|
+ }else {
|
|
|
|
+ reMap.put("shippingNo",wayBillResponse.getLogisticsNo());
|
|
|
|
+ reMap.put("shippingCode","YD");
|
|
|
|
+ reMap.put("shippingName","韵达快递");
|
|
|
|
+ reMap.put("orderStatus","300");
|
|
|
|
+ reMap.put("shippingStatus","1");
|
|
}
|
|
}
|
|
|
|
+ wxOrderGrabService.updateBuyerPayCheck(reMap);
|
|
|
|
+
|
|
}else if(CcnetContants.notiType.item_20.getItem().equals(wayBillResponse.getNotiType()) && CcnetContants.serviceStates.item_3.getItem().equals(wayBillResponse.getNotiStatus())){
|
|
}else if(CcnetContants.notiType.item_20.getItem().equals(wayBillResponse.getNotiType()) && CcnetContants.serviceStates.item_3.getItem().equals(wayBillResponse.getNotiStatus())){
|
|
cusWaybillStatus.setRespStatus(Contants.FAIL_STATUS);
|
|
cusWaybillStatus.setRespStatus(Contants.FAIL_STATUS);
|
|
Map<String, Object> wxMap = createWxOrderGrabMap(wayBillResponse);
|
|
Map<String, Object> wxMap = createWxOrderGrabMap(wayBillResponse);
|
|
@@ -147,16 +154,6 @@ public class Ceb511Response {
|
|
Map<String, Object> recordMap = ImmutableMap.of("orderSn", wxOrder.getOrderSn(), "shipmentStartTime",new Date());
|
|
Map<String, Object> recordMap = ImmutableMap.of("orderSn", wxOrder.getOrderSn(), "shipmentStartTime",new Date());
|
|
wxOrderGrabService.updateMallOrderProcessRecord(recordMap);
|
|
wxOrderGrabService.updateMallOrderProcessRecord(recordMap);
|
|
|
|
|
|
- Map<String, Object> reMap = new HashMap<>();
|
|
|
|
- reMap.put("orderSn",wxOrder.getOrderSn());
|
|
|
|
- reMap.put("shippingNo",wayBillResponse.getLogisticsNo());
|
|
|
|
- reMap.put("shippingCode","YD");
|
|
|
|
- reMap.put("shippingName","韵达快递");
|
|
|
|
- reMap.put("orderStatus","300");
|
|
|
|
- reMap.put("shippingStatus","1");
|
|
|
|
- wxOrderGrabService.updateBuyerPayCheck(reMap);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
}else{
|
|
}else{
|
|
String info = "状态非法,无需处理";
|
|
String info = "状态非法,无需处理";
|
|
LOGGER.error("--- {}", info);
|
|
LOGGER.error("--- {}", info);
|