FengChaoYu 1 ماه پیش
والد
کامیت
c712b4674d

+ 0 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -20,7 +20,6 @@ import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -590,7 +590,7 @@ public class UserLogic {
         if (examineStatus.equals(ExamineStatusEnum.OK.getKey())) {
             if (StringUtils.isNotBlank(user.getWorkerNumber())
                     && !StringUtils.equals(user.getWorkerNumber(), websitUser.getWorkerNumber())) {
-                throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入师傅编号" + websitUser.getWorkerNumber() + "不一致");
+                throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入" + user.getIdCard() + "师傅编号" + websitUser.getWorkerNumber() + "不一致");
             }
             user.setType(UserTypeEnum.WORKER.getKey());
             user.setWorkerNumber(websitUser.getWorkerNumber());
@@ -703,7 +703,7 @@ public class UserLogic {
         // 用户师傅编号不为空并且师傅编号与传入师傅编号不一致,抛错
         if (StringUtils.isNotBlank(user.getWorkerNumber() )
                 && !StringUtils.equals(user.getWorkerNumber(), workerNumber)) {
-            throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入师傅编号" + workerNumber + "不一致");
+            throw new RemoteServiceException("用户师傅编号" + user.getWorkerNumber() + "与本次传入" + user.getIdCard() + "师傅编号" + workerNumber + "不一致");
         }
 
         // 先清空网点师傅记录