万青 弥补 快递 相关接口提交

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/WqTempVo.java

@@ -25,6 +25,8 @@ public class WqTempVo implements Cloneable{
     private String phone;
     @ApiModelProperty(value = "快递单号")
     private String mailNo;
+    @ApiModelProperty(value = "是否是万青补偿订单")
+    private Integer isTemp;
 
     private static final WqTempVo obj = new WqTempVo();
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/TempServiceImpl.java

@@ -62,9 +62,6 @@ public class TempServiceImpl implements IKylinTempService {
         try {
             String uid = CurrentUtil.getCurrentUid();
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(param.getOrderId());
-            if (orderTicketVo == null) {
-                orderTicketVo = dataUtils.getTransferOrder(uid);
-            }
             if (uid.equals("809406") || uid.equals("773650")) {
             } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
@@ -72,6 +69,11 @@ public class TempServiceImpl implements IKylinTempService {
                 }
             }
 
+            Integer isTemp = dataUtils.getWqOrderId(param.getOrderId());
+            if(isTemp == 0){
+                return ResponseDto.failure(ErrorMapping.get("20003"));
+            }
+
             LocalDateTime now = LocalDateTime.now();
             //获取用户相关
             String expressContact = param.getName();
@@ -108,9 +110,6 @@ public class TempServiceImpl implements IKylinTempService {
     public ResponseDto<WqTempVo> getWqTempExpress(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
-        if (orderTicketVo == null) {
-            orderTicketVo = dataUtils.getTransferOrder(uid);
-        }
         if (uid.equals("809406") || uid.equals("773650")) {
         } else {
             if (!orderTicketVo.getUserId().equals(uid)) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -904,9 +904,20 @@ public class DataUtils {
         redisUtil.del(redisKey);
     }
 
+    //万青补偿id 获取
+    public Integer getWqOrderId(String orderId){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
+        Object obj = redisUtil.get(rdk);
+        if(obj==null){
+            return 0;
+        }else{
+            return 1;
+        }
+    }
+
     //万青补偿id 添加
     public void setWqOrderId(String orderId){
-        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX;
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
         redisUtil.set(rdk,orderId);
     }
 
@@ -925,9 +936,13 @@ public class DataUtils {
         String rdk = KylinRedisConst.REDIS_WQ_ORDER_EXPRESS.concat(orderId);
         Object obj = redisUtil.get(rdk);
         if(obj==null){
-            return null;
+            WqTempVo vo = WqTempVo.getNew();
+            vo.setIsTemp(getWqOrderId(orderId));
+            return vo;
         }else{
-            return (WqTempVo) obj;
+            WqTempVo vo = (WqTempVo) obj;
+            vo.setIsTemp(getWqOrderId(orderId));
+            return vo;
         }
     }