|
|
|
@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@ -232,7 +233,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer |
|
|
|
public ResultBean saveAll(BaseManufacturerAllDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BaseManufacturerDto baseManufacturerDto = dto.getBaseManufacturerDto(); |
|
|
|
BaseManufacturerBankDto baseManufacturerBankDto = dto.getBaseManufacturerBankDto(); |
|
|
|
List<BaseManufacturerBankDto> baseManufacturerBankDto = dto.getBaseManufacturerBankDto(); |
|
|
|
BaseManufacturerFinanceDto baseManufacturerFinanceDto = dto.getBaseManufacturerFinanceDto(); |
|
|
|
String sid = ""; |
|
|
|
if (baseManufacturerDto != null) { |
|
|
|
@ -242,10 +243,12 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer |
|
|
|
} |
|
|
|
sid = resultBean.getData(); |
|
|
|
} |
|
|
|
if (baseManufacturerBankDto != null) { |
|
|
|
ResultBean resultBean1 = saveBaseManufacturerBankDto(baseManufacturerBankDto, sid); |
|
|
|
if (!resultBean1.getCode().equals("200")) { |
|
|
|
return resultBean1; |
|
|
|
if (baseManufacturerBankDto.size() > 0) { |
|
|
|
for (BaseManufacturerBankDto manufacturerBankDto : baseManufacturerBankDto) { |
|
|
|
ResultBean resultBean1 = saveBaseManufacturerBankDto(manufacturerBankDto, sid); |
|
|
|
if (!resultBean1.getCode().equals("200")) { |
|
|
|
return resultBean1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (baseManufacturerFinanceDto != null) { |
|
|
|
@ -286,14 +289,14 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//查询厂商名称是否存在
|
|
|
|
String weChatID = dto.getWeChatID(); |
|
|
|
if (StringUtils.isNotBlank(weChatID)){ |
|
|
|
if (StringUtils.isNotBlank(weChatID)) { |
|
|
|
if (!weChatID.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weChatID.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) { |
|
|
|
return rb.setMsg("微信号格式不正确"); |
|
|
|
} |
|
|
|
} |
|
|
|
String email = dto.getEmail(); |
|
|
|
if (StringUtils.isNotBlank(email)){ |
|
|
|
if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")){ |
|
|
|
if (StringUtils.isNotBlank(email)) { |
|
|
|
if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")) { |
|
|
|
return rb.setMsg("邮箱格式不正确"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -325,7 +328,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer |
|
|
|
} |
|
|
|
BaseManufacturerAllVo baseManufacturerAllVo = new BaseManufacturerAllVo(); |
|
|
|
BaseManufacturerDetailsVo baseManufacturerDetailsVo = selectDetailsBySid(sid); |
|
|
|
BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankService.selectDetails(sid); |
|
|
|
List<BaseManufacturerBankVo> baseManufacturerBankVo = baseManufacturerBankService.selectDetails(sid); |
|
|
|
BaseManufacturerFinanceVo baseManufacturerFinanceVo = baseManufacturerFinanceService.selectDetails(sid); |
|
|
|
baseManufacturerAllVo.setBaseManufacturerDto(baseManufacturerDetailsVo); |
|
|
|
baseManufacturerAllVo.setBaseManufacturerBankDto(baseManufacturerBankVo); |
|
|
|
@ -344,10 +347,20 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer |
|
|
|
if (i == 0) { |
|
|
|
return ResultBean.fireFail().setMsg("供应厂商信息修改失败"); |
|
|
|
} |
|
|
|
BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.selectByBaseManufacturerSid(sid); |
|
|
|
baseManufacturerBankService.updateBySid(dto.getBaseManufacturerBankDto().toMap(),baseManufacturerBank.getSid()); |
|
|
|
List<String> strings = new ArrayList<>(); |
|
|
|
strings.add(sid); |
|
|
|
baseManufacturerBankService.updateBySidIsDelete(strings); |
|
|
|
List<BaseManufacturerBankDto> baseManufacturerBankDto = dto.getBaseManufacturerBankDto(); |
|
|
|
if (baseManufacturerBankDto.size() > 0) { |
|
|
|
for (BaseManufacturerBankDto manufacturerBankDto : baseManufacturerBankDto) { |
|
|
|
ResultBean resultBean1 = saveBaseManufacturerBankDto(manufacturerBankDto, sid); |
|
|
|
if (!resultBean1.getCode().equals("200")) { |
|
|
|
return resultBean1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
BaseManufacturerFinance baseManufacturerFinance = baseManufacturerFinanceService.selectByBaseManufacturerSid(sid); |
|
|
|
baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(),baseManufacturerFinance.getSid()); |
|
|
|
baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid()); |
|
|
|
return rb.success().setMsg("修改成功"); |
|
|
|
} |
|
|
|
} |
God
3 years ago