日志调整

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssDeviceLossReqDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.managew.dto.ass;
 
 import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import io.swagger.annotations.ApiModel;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @ApiModel(description = "卡签挂失解挂")
 @Getter
 @Setter
-public class AssDeviceLossReqDTO extends AbstractBizRequestDTO {
+public class AssDeviceLossReqDTO extends AbstractStaffBizRequestDTO {
 
     //业务类型 1-单卡挂失 2-单签挂失 3-卡签挂失 4-单卡解挂 5-单签解挂 6-卡签解挂
     @ApiModelProperty(value = "业务类型", required = true)
@@ -44,10 +44,6 @@ public class AssDeviceLossReqDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "行驶证反面")
     private String vehNegImgUrl;
 
-    //员工Id
-    @ApiModelProperty(value = "员工Id")
-    private String staffId;
-
     @Override
     protected void validate(ViolationValidator validator) {
         super.validate(validator);
@@ -61,12 +57,8 @@ public class AssDeviceLossReqDTO extends AbstractBizRequestDTO {
             validator.addViolation("loginSource", "登录来源有误");
         }
         if (getOrderSource() == SourceType.SERVICE_HALL) {
-            validator.validFieldNotBlank("staffId", staffId);
             validator.validFieldNotBlank("vehPosImgUrl", vehPosImgUrl);
             validator.validFieldNotBlank("vehNegImgUrl", vehNegImgUrl);
         }
-        if (getOrderSource() == SourceType.WEB){
-            validator.validFieldNotBlank("staffId", staffId);
-        }
     }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssDeviceLossManagerImpl.java

@@ -87,12 +87,12 @@ public class AssDeviceLossManagerImpl extends AbstractManagewManager implements
         }
 
         logger.info("=>返回结果：订单号{}，状态码{}，状态信息{}",response.getOrderNo(), response.getCode(),response.getMsg());
-        // 保存日志操作日志
-        persistOperateLog(operateType, response.getOrderNo(), source, findOpenIdByToken(reqDto.getAccessToken()), "挂失解挂操作" + response.getMsg());
 
         if (!"1".equals(response.getCode())) {
-            throw new ManagerException("出错了", response.getMsg());
+            throw new ManagerException("出错了"+response.getMsg());
         }
+        // 保存日志操作日志，失败不计入日志
+        persistOperateLog(operateType, response.getOrderNo(), source, findOpenIdByToken(reqDto.getAccessToken()), "挂失解挂操作" + response.getMsg());
     }
 
     @Override