|
@@ -825,6 +825,25 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ public ErpOrderQueryResponse getOrderScrm(ErpOrderQueryRequert param) {
|
|
|
|
+ Map<String,String> map = new HashMap<>();
|
|
|
|
+ map.put("src_tid",param.getCode());
|
|
|
|
+ try {
|
|
|
|
+ String execute = client.execute("sales_trade_query.php", map);
|
|
|
|
+ ParserConfig config = new ParserConfig();
|
|
|
|
+ config.propertyNamingStrategy = PropertyNamingStrategy.CamelCase;
|
|
|
|
+ ErpWdtTradeQueryResponse tradeQueryResponseDTO = JSON.parseObject(execute, ErpWdtTradeQueryResponse.class);
|
|
|
|
+ if(ObjectUtil.equal(0,tradeQueryResponseDTO.getCode())){
|
|
|
|
+ ErpOrderQueryResponse erpOrderQueryResponse = ErpWdtToErpOrderMapper.INSTANCE.toErpOrderQueryResponse(tradeQueryResponseDTO);
|
|
|
|
+ log.info("查询订单成功: {}", erpOrderQueryResponse);
|
|
|
|
+ return erpOrderQueryResponse;
|
|
|
|
+ } else {
|
|
|
|
+ throw new RuntimeException(String.format("查询订单失败, 原因: %s", tradeQueryResponseDTO.getMessage()));
|
|
|
|
+ }
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
+ throw new RuntimeException(e);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public BaseResponse refundUpdate(ErpRefundUpdateRequest param) {
|
|
public BaseResponse refundUpdate(ErpRefundUpdateRequest param) {
|
|
@@ -1104,7 +1123,7 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
|
|
status.add(105);
|
|
status.add(105);
|
|
status.add(110);
|
|
status.add(110);
|
|
|
|
|
|
- ErpOrderQueryResponse response = getOrder(request);
|
|
|
|
|
|
+ ErpOrderQueryResponse response = getOrderScrm(request);
|
|
ErpOrderQuery erpOrderQuery = response.getOrders().get(0);
|
|
ErpOrderQuery erpOrderQuery = response.getOrders().get(0);
|
|
Integer deliveryState = erpOrderQuery.getDelivery_state();
|
|
Integer deliveryState = erpOrderQuery.getDelivery_state();
|
|
// 如果是未发货
|
|
// 如果是未发货
|