fix
This commit is contained in:
@@ -5,6 +5,7 @@ import com.cool.store.enums.AuditResultTypeEnum;
|
||||
import com.cool.store.enums.AuditTypeEnum;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@@ -34,6 +35,13 @@ public class PlatformBuildAuditRequest {
|
||||
|
||||
@ApiModelProperty(value = "操作人姓名", hidden = true)
|
||||
private String operateUserName;
|
||||
@Length(max = 250, message = "平台账号 长度不能超过250")
|
||||
@ApiModelProperty("平台账号")
|
||||
private String account;
|
||||
|
||||
@Length(max = 250, message = "平台密码 长度不能超过250")
|
||||
@ApiModelProperty("平台密码)")
|
||||
private String password;
|
||||
|
||||
public static ShopAuditInfoDO convert(PlatformBuildAuditRequest request, AuditTypeEnum auditType) {
|
||||
ShopAuditInfoDO result = new ShopAuditInfoDO();
|
||||
|
||||
@@ -72,13 +72,6 @@ public class PlatformBuildRequest {
|
||||
@Length(max = 250, message = "快手平台账号 长度不能超过250")
|
||||
private String ksAccount;
|
||||
|
||||
@Length(max = 250, message = "平台账号 长度不能超过250")
|
||||
@ApiModelProperty("平台账号")
|
||||
private String account;
|
||||
|
||||
@Length(max = 250, message = "平台密码 长度不能超过250")
|
||||
@ApiModelProperty("平台密码)")
|
||||
private String password;
|
||||
|
||||
|
||||
public PlatformBuildDO toDO() {
|
||||
@@ -94,8 +87,6 @@ public class PlatformBuildRequest {
|
||||
platformBuildDO.setSettlerBankName(this.settlerBankName);
|
||||
platformBuildDO.setStorePositioningUrl(this.storePositioningUrl);
|
||||
platformBuildDO.setAuthorizationUrl(this.authorizationUrl);
|
||||
platformBuildDO.setAccount(this.account);
|
||||
platformBuildDO.setPassword(this.password);
|
||||
return platformBuildDO;
|
||||
|
||||
}
|
||||
|
||||
@@ -422,6 +422,8 @@ private Integer doThing(PlatformBuildDO platformBuildDO, PlatformBuildAuditReque
|
||||
List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, nowStatus, OperationTypeEnum.OPERATION_TYPE_1.getCode());
|
||||
operationLogService.batchUpdateProcessed(operationLogs, auditId, request.getOperateUserId(), request.getReason());
|
||||
platformBuildDO.setAuditId(auditId);
|
||||
platformBuildDO.setAccount(request.getAccount());
|
||||
platformBuildDO.setPassword(request.getPassword());
|
||||
platformBuildDO.setUpdateTime(new Date());
|
||||
platformBuildDO.setUpdateUser(request.getOperateUserId());
|
||||
return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuildDO);
|
||||
|
||||
Reference in New Issue
Block a user