tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/controller/LoginController.java

@@ -104,11 +104,11 @@ public class LoginController {
                 && flag) {
             return ServerResponseEntity.showFailMsg("tempUid is blank");
         }
-//        //TODO 校验验证码
+        // 校验验证码
-//        ServerResponseEntity<Boolean> validCodeResponse = notifyFeignClient.checkValidCode(loginCode.getMobile(), loginCode.getValidCode(), SendTypeEnum.LOGIN);
+        ServerResponseEntity<Boolean> validCodeResponse = notifyFeignClient.checkValidCode(loginCode.getMobile(), loginCode.getValidCode(), SendTypeEnum.LOGIN);
-//        if (!validCodeResponse.isSuccess() || !validCodeResponse.getData()) {
+        if (!validCodeResponse.isSuccess() || !validCodeResponse.getData()) {
-//            return ServerResponseEntity.fail(ResponseEnum.VERIFICATION_CODE_ERROR);
+            return ServerResponseEntity.fail(ResponseEnum.VERIFICATION_CODE_ERROR);
-//        }
+        }
         // 如果没有注册的话，短信登录将会进行注册
         // 在pc/小程序/公众号的登录，都有短信登录的方法。但是公众号/小程序的短信登录，登录了之后会见这个用户和公众号/小程序绑定一起（登录并绑定）
         return threeInOneLogin(loginCode.getMobile(), loginCode.getTempUid(), loginCode.getSocialType());

tmerclub-auth/src/main/java/com/tmerclub/cloud/auth/dto/LoginCodeDTO.java

@@ -29,7 +29,7 @@ public class LoginCodeDTO implements Serializable {
     private String mobile;
 
     @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED)
-    //TODO @NotBlank(message = "验证码不能为空")
+    @NotBlank(message = "验证码不能为空")
     private String validCode;
 
     /**

tmerclub-common/tmerclub-common-core/src/main/java/com/tmerclub/cloud/common/bean/Quick100.java

@@ -2,15 +2,11 @@
 package com.tmerclub.cloud.common.bean;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.ToString;
 
 /**
  * 快递鸟物流详情查询
  * @author SJL
  */
-@Data
-@ToString
 public class Quick100 extends SwitchBaseModel {
 
     /**
@@ -42,10 +38,59 @@ public class Quick100 extends SwitchBaseModel {
      */
     private Boolean mock;
 
-    /**
+    public String getCustomer() {
-     * C端下单接口
+        return customer;
-     *
+    }
-     */
-    private String cOrder;
 
+    public void setCustomer(String customer) {
+        this.customer = customer;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getReqUrl() {
+        return reqUrl;
+    }
+
+    public void setReqUrl(String reqUrl) {
+        this.reqUrl = reqUrl;
+    }
+
+    public Boolean getIsPrint() {
+        return isPrint;
+    }
+
+    public void setIsPrint(Boolean print) {
+        isPrint = print;
+    }
+
+    public String getPrintReqUrl() {
+        return printReqUrl;
+    }
+
+    public void setPrintReqUrl(String printReqUrl) {
+        this.printReqUrl = printReqUrl;
+    }
+
+    public Boolean getMock() {
+        return mock;
+    }
+
+    public void setMock(Boolean mock) {
+        this.mock = mock;
+    }
 }

tmerclub-order/src/main/java/com/tmerclub/cloud/delivery/manager/DeliveryPrintManager.java

@@ -97,18 +97,7 @@ public class DeliveryPrintManager {
         printReq.put("param", param);
         String repJson = HttpUtil.post(quick100.getPrintReqUrl(), printReq);
         logger.info("电子面单请求返回：" + repJson);
-        DeliveryPrintInfoBO deliveryPrintInfoBO = new DeliveryPrintInfoBO();
+        DeliveryPrintInfoBO deliveryPrintInfoBO = Json.parseObject(repJson, DeliveryPrintInfoBO.class);
-        // mock == true
-        if (quick100.getMock()) {
-            deliveryPrintInfoBO.setSuccess(true);
-            deliveryPrintInfoBO.setCode(SUCCESS_CODE);
-            DeliveryPrintDataInfoBO deliveryPrintDataInfoBO = new DeliveryPrintDataInfoBO();
-            deliveryPrintDataInfoBO.setKuaidinum("666");
-            deliveryPrintInfoBO.setData(deliveryPrintDataInfoBO);
-        }else {
-            deliveryPrintInfoBO = Json.parseObject(repJson, DeliveryPrintInfoBO.class);
-        }
-
         if (Objects.isNull(deliveryPrintInfoBO)) {
             DeliveryPrintInfoErrorBO deliveryPrintInfoErrorBO = Json.parseObject(repJson, DeliveryPrintInfoErrorBO.class);
             if (Objects.isNull(deliveryPrintInfoErrorBO)) {