|
@@ -80,6 +80,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
|
|
|
import com.github.binarywang.wxpay.service.WxPayService;
|
|
|
import com.google.gson.Gson;
|
|
|
import lombok.Synchronized;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.json.JSONObject;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -111,6 +112,7 @@ import static com.fs.his.utils.PhoneUtil.decryptPhone;
|
|
|
*/
|
|
|
@Lazy
|
|
|
@Service
|
|
|
+@Slf4j
|
|
|
public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
{
|
|
|
Logger logger= LoggerFactory.getLogger(getClass());
|
|
@@ -1941,7 +1943,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
}
|
|
|
}
|
|
|
ExpressInfoDTO dto=expressService.getExpressInfo(order.getOrderCode(),order.getDeliveryCode(),order.getDeliverySn(),lastFourNumber);
|
|
|
- if(dto.getStateEx().equals("0")&&dto.getState().equals("0")){
|
|
|
+ log.info("快递鸟查询dto:{}", JSONUtil.toJsonStr(dto));
|
|
|
+ if (!dto.isSuccess()){
|
|
|
+ return R.error(dto.getReason());
|
|
|
+ }
|
|
|
+ if("0".equals(dto.getStateEx())&&"0".equals(dto.getState())){
|
|
|
lastFourNumber = "19923690275";
|
|
|
if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
|
|
|
lastFourNumber = order.getUserPhone();
|