Skip to content

C
customer-service
Commit 2cf02814 authored by huangcb's avatar huangcb
Browse files
Options

承运商接口：编辑承运商信息

parent 24f5fc34
Show whitespace changes
Inline Side-by-side
Showing with 415 additions and 51 deletions
src/main/java/com/esv/freight/customer/common/component/ErrorMessageComponent.java
View file @ 2cf02814
......@@ -108,13 +108,21 @@ public class ErrorMessageComponent {
@Value("${error-message.goodsowner.ext.account-address.1003}")
private String goodsOwnerExtAccountAddress1003;
@Value("${error-message.carrier.account.add.1011}")
private String carrierAccountAdd1011;
@Value("${error-message.carrier.account.add.1012}")
private String carrierAccountAdd1012;
@Value("${error-message.carrier.account.add.1013}")
private String carrierAccountAdd1013;
@Value("${error-message.carrier.account.add.1014}")
private String carrierAccountAdd1014;
@Value("${error-message.carrier.account.add.1001}")
private String carrierAccountAdd1001;
@Value("${error-message.carrier.account.add.1002}")
private String carrierAccountAdd1002;
@Value("${error-message.carrier.account.add.1003}")
private String carrierAccountAdd1003;
@Value("${error-message.carrier.account.add.1004}")
private String carrierAccountAdd1004;
@Value("${error-message.carrier.account.edit.1001}")
private String carrierAccountEdit1001;
@Value("${error-message.carrier.account.edit.1002}")
private String carrierAccountEdit1002;
@Value("${error-message.carrier.account.edit.1003}")
private String carrierAccountEdit1003;
@Value("${error-message.carrier.account.edit.1004}")
private String carrierAccountEdit1004;
}
src/main/java/com/esv/freight/customer/module/carrier/controller/CarrierAccountController.java
View file @ 2cf02814
......@@ -5,6 +5,7 @@ import com.esv.freight.customer.common.exception.EException;
import com.esv.freight.customer.common.response.EResponse;
import com.esv.freight.customer.common.util.ReqUtils;
import com.esv.freight.customer.common.validator.groups.ValidatorInsert;
import com.esv.freight.customer.common.validator.groups.ValidatorUpdate;
import com.esv.freight.customer.module.carrier.CarrierConstants;
import com.esv.freight.customer.module.carrier.form.CarrierInfoForm;
import com.esv.freight.customer.module.carrier.service.CarrierAccountService;
......@@ -36,6 +37,13 @@ public class CarrierAccountController {
this.carrierAccountService = carrierAccountService;
}
/**
* description 新增承运商帐号
* param [form]
* return com.esv.freight.customer.common.response.EResponse
* author Administrator
* createTime 2020/04/24 14:49
**/
@PostMapping("/add")
public EResponse createAccountByManage(@RequestBody @Validated(ValidatorInsert.class) CarrierInfoForm form) throws EException {
/****************************** 参数校验 ******************************/
......@@ -52,4 +60,25 @@ public class CarrierAccountController {
data.put("id", id);
return EResponse.ok(data);
}
/**
* description 编辑承运商信息
* param [form]
* return com.esv.freight.customer.common.response.EResponse
* author Administrator
* createTime 2020/04/24 14:50
**/
@PostMapping("/edit")
public EResponse editAccountByManage(@RequestBody @Validated(ValidatorUpdate.class) CarrierInfoForm form) throws EException {
/****************************** 参数校验 ******************************/
// 承运商为企业
if (CarrierConstants.CARRIER_TYPE_COMPANY.equals(form.getCarrierType())) {
String[] notBlankParams = new String[] {"uniCreditCode", "carrierFullName", "provinceCode", "cityCode", "districtCode", "detailAddress"
, "legalPerson", "businessLicenseUrl"};
ReqUtils.checkParamsNotBlank(JSONObject.parseObject(form.toString()), notBlankParams);
}
/****************************** 参数校验 ******************************/
return EResponse.ok(carrierAccountService.updateCarrier(form));
}
}
src/main/java/com/esv/freight/customer/module/carrier/form/CarrierInfoForm.java
View file @ 2cf02814
package com.esv.freight.customer.module.carrier.form;
import com.esv.freight.customer.common.validator.groups.ValidatorInsert;
import com.esv.freight.customer.common.validator.groups.ValidatorUpdate;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -9,7 +10,6 @@ import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
/**
* @description:
......@@ -26,6 +26,7 @@ public class CarrierInfoForm {
/**
*
*/
@NotNull(message = "参数id不能为空", groups = {ValidatorUpdate.class})
private Long id;
/**
* 登录帐号，承运商联系人电话
......@@ -36,108 +37,108 @@ public class CarrierInfoForm {
/**
* 帐号密码
*/
@Length(min = 32, max = 32, message = "参数password长度不合法", groups = {ValidatorInsert.class})
@Length(min = 32, max = 32, message = "参数password长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotBlank(message = "参数password不能为空", groups = {ValidatorInsert.class})
private String password;
/**
* 统一社会信用代码
*/
@Length(max = 32, message = "参数uniCreditCode长度不合法", groups = {ValidatorInsert.class})
@Length(max = 32, message = "参数uniCreditCode长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String uniCreditCode;
/**
* 承运商名称
*/
@Length(max = 50, message = "参数carrierFullName长度不合法", groups = {ValidatorInsert.class})
@Length(max = 50, message = "参数carrierFullName长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String carrierFullName;
/**
* 承运商简称
*/
@Length(max = 50, message = "参数carrierBriefName长度不合法", groups = {ValidatorInsert.class})
@Length(max = 50, message = "参数carrierBriefName长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String carrierBriefName;
/**
* 承运商类别：1-企业承运人、2-个体承运人
*/
@Range(min = 1, max = 2, message = "参数carrierType不合法")
@Range(min = 1, max = 2, message = "参数carrierType不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotNull(message = "参数carrierType不能为空", groups = {ValidatorInsert.class})
private Integer carrierType;
/**
* 承运商车辆类型（字典表）：1-自营车、2-外协车、3-其他
*/
@Range(min = 1, max = 3, message = "参数carrierVehicleType不合法")
@Range(min = 1, max = 3, message = "参数carrierVehicleType不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotNull(message = "参数carrierVehicleType不能为空", groups = {ValidatorInsert.class})
private Integer carrierVehicleType;
/**
* 企业注册地址-省份代码
*/
@Length(min = 6, max = 6, message = "参数provinceCode长度不合法", groups = {ValidatorInsert.class})
@Length(min = 6, max = 6, message = "参数provinceCode长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String provinceCode;
/**
* 企业注册地址-市代码
*/
@Length(min = 6, max = 6, message = "参数cityCode长度不合法", groups = {ValidatorInsert.class})
@Length(min = 6, max = 6, message = "参数cityCode长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String cityCode;
/**
* 企业注册地址-区县代码
*/
@Length(min = 6, max = 6, message = "参数districtCode长度不合法", groups = {ValidatorInsert.class})
@Length(min = 6, max = 6, message = "参数districtCode长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String districtCode;
/**
* 企业注册地址-详细地址
*/
@Length(max = 100, message = "参数detailAddress长度不合法", groups = {ValidatorInsert.class})
@Length(max = 100, message = "参数detailAddress长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String detailAddress;
/**
* 企业法人姓名
*/
@Length(max = 20, message = "参数legalPerson长度不合法", groups = {ValidatorInsert.class})
@Length(max = 20, message = "参数legalPerson长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String legalPerson;
/**
* 营业执照URL
*/
@Length(max = 200, message = "参数businessLicenseUrl长度不合法", groups = {ValidatorInsert.class})
@Length(max = 200, message = "参数businessLicenseUrl长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String businessLicenseUrl;
/**
* 道路运输经营许可证号
*/
@Length(max = 20, message = "参数roadLicenseNumber长度不合法", groups = {ValidatorInsert.class})
@Length(max = 20, message = "参数roadLicenseNumber长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotBlank(message = "参数roadLicenseNumber不能为空", groups = {ValidatorInsert.class})
private String roadLicenseNumber;
/**
* 经营范围
*/
@Length(max = 200, message = "参数businessScope长度不合法", groups = {ValidatorInsert.class})
@Length(max = 200, message = "参数businessScope长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String businessScope;
/**
* 道路运输经营许可证有效期
*/
@Length(max = 20, message = "参数roadLicenseExpireDate长度不合法", groups = {ValidatorInsert.class})
@Length(max = 20, message = "参数roadLicenseExpireDate长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String roadLicenseExpireDate;
/**
* 道路运输经营许可证URL
*/
@Length(max = 200, message = "参数roadLicenseUrl长度不合法", groups = {ValidatorInsert.class})
@Length(max = 200, message = "参数roadLicenseUrl长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotBlank(message = "参数roadLicenseUrl不能为空", groups = {ValidatorInsert.class})
private String roadLicenseUrl;
/**
* 联系人
*/
@Length(max = 20, message = "参数contactor长度不合法", groups = {ValidatorInsert.class})
@Length(max = 20, message = "参数contactor长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
@NotBlank(message = "参数contactor不能为空", groups = {ValidatorInsert.class})
private String contactor;
/**
* 电子邮件
*/
@Length(max = 50, message = "参数email长度不合法", groups = {ValidatorInsert.class})
@Length(max = 50, message = "参数email长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String email;
/**
* 信用评分：1-100
*/
@Range(min = 1, max = 100, message = "参数creditScore不合法")
@Range(min = 1, max = 100, message = "参数creditScore不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private Integer creditScore;
/**
* 备注
*/
@Length(max = 100, message = "参数remark长度不合法", groups = {ValidatorInsert.class})
@Length(max = 100, message = "参数remark长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
private String remark;
@Override
......
src/main/java/com/esv/freight/customer/module/carrier/service/CarrierAccountService.java
View file @ 2cf02814
......@@ -32,5 +32,14 @@ public interface CarrierAccountService extends IService<CarrierAccountEntity> {
**/
Long insertCarrier(CarrierInfoForm form);
/**
* description 编辑承运商信息
* param [form]
* return java.lang.Integer
* author Administrator
* createTime 2020/04/24 14:27
**/
Integer updateCarrier(CarrierInfoForm form);
}
src/main/java/com/esv/freight/customer/module/carrier/service/impl/CarrierAccountServiceImpl.java
View file @ 2cf02814
package com.esv.freight.customer.module.carrier.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.freight.customer.common.component.ErrorMessageComponent;
import com.esv.freight.customer.common.component.PasswordComponent;
......@@ -16,6 +17,7 @@ import com.esv.freight.customer.module.carrier.form.CarrierInfoForm;
import com.esv.freight.customer.module.carrier.form.CarrierQueryForm;
import com.esv.freight.customer.module.carrier.service.CarrierAccountService;
import com.esv.freight.customer.module.carrier.service.CarrierInfoService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -60,14 +62,14 @@ public class CarrierAccountServiceImpl extends ServiceImpl<CarrierAccountDao, Ca
CarrierQueryForm carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setAccount(form.getAccount());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1011, errorMessageComponent.getCarrierAccountAdd1011());
throw new EException(1001, errorMessageComponent.getCarrierAccountAdd1001());
}
// 1.2:校验道路运输经营许可证号是否已存在
carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setRoadLicenseNumber(form.getRoadLicenseNumber());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1012, errorMessageComponent.getCarrierAccountAdd1012());
throw new EException(1002, errorMessageComponent.getCarrierAccountAdd1002());
}
// 承运商为企业
......@@ -76,14 +78,14 @@ public class CarrierAccountServiceImpl extends ServiceImpl<CarrierAccountDao, Ca
carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setUniCreditCode(form.getUniCreditCode());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1013, errorMessageComponent.getCarrierAccountAdd1013());
throw new EException(1003, errorMessageComponent.getCarrierAccountAdd1003());
}
// 1.4:校验名称是否已存在
carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setCarrierFullName(form.getCarrierFullName());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1014, errorMessageComponent.getCarrierAccountAdd1014());
throw new EException(1004, errorMessageComponent.getCarrierAccountAdd1004());
}
}
......@@ -120,4 +122,58 @@ public class CarrierAccountServiceImpl extends ServiceImpl<CarrierAccountDao, Ca
return accountId;
}
@Override
public Integer updateCarrier(CarrierInfoForm form) {
int count = 0;
// 1:校验
// 1.1:校验帐号ID是否有效
CarrierAccountEntity entity = this.baseMapper.selectById(form.getId());
if (null == entity) {
throw new EException(1001, errorMessageComponent.getCarrierAccountEdit1001());
}
// 1.2:校验道路运输经营许可证号是否已存在
CarrierQueryForm carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setId(form.getId());
carrierQueryForm.setRoadLicenseNumber(form.getRoadLicenseNumber());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1002, errorMessageComponent.getCarrierAccountEdit1002());
}
// 承运商为企业
if (CarrierConstants.CARRIER_TYPE_COMPANY.equals(form.getCarrierType())) {
// 1.3:校验统一社会信用代码是否已存在
carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setId(form.getId());
carrierQueryForm.setUniCreditCode(form.getUniCreditCode());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1003, errorMessageComponent.getCarrierAccountEdit1003());
}
// 1.4:校验名称是否已存在
carrierQueryForm = new CarrierQueryForm();
carrierQueryForm.setId(form.getId());
carrierQueryForm.setCarrierFullName(form.getCarrierFullName());
if (this.isAccountExit(carrierQueryForm)) {
throw new EException(1004, errorMessageComponent.getCarrierAccountEdit1004());
}
}
// 2:更新帐号密码
if (StringUtils.isNotBlank(form.getPassword())) {
CarrierAccountEntity accountEntity = new CarrierAccountEntity();
accountEntity.setId(form.getId());
accountEntity.setPassword(passwordComponent.generatePwd4Salt(form.getPassword(), entity.getSalt()));
count += this.baseMapper.updateById(accountEntity);
}
// 3:更新帐号信息
CarrierInfoEntity carrierInfoEntity = new CarrierInfoEntity();
BeanUtils.copyProperties(form, carrierInfoEntity);
count += this.carrierInfoService.getBaseMapper().update(carrierInfoEntity,
new UpdateWrapper<CarrierInfoEntity>().lambda().
eq(CarrierInfoEntity::getAccountId, form.getId()));
return count;
}
}
\ No newline at end of file
src/main/resources/application-dev.yml
View file @ 2cf02814
......@@ -109,7 +109,12 @@ error-message:
carrier:
account:
add:
1011: 帐号已存在
1012: 道路运输经营许可证号已存在
1013: 统一社会信用代码已存在
1014: 承运商名称已存在
\ No newline at end of file
1001: 帐号已存在
1002: 道路运输经营许可证号已存在
1003: 统一社会信用代码已存在
1004: 承运商名称已存在
edit:
1001: 无效的帐号ID
1002: 道路运输经营许可证号已存在
1003: 统一社会信用代码已存在
1004: 承运商名称已存在
\ No newline at end of file
src/main/resources/mapper/carrier/CarrierAccountDao.xml
View file @ 2cf02814
......@@ -28,7 +28,7 @@
from carrier_account a, carrier_info b
where a.id = b.account_id
<if test="id != null">
<![CDATA[ a.id <> #{id} ]]>
<![CDATA[ and a.id <> #{id} ]]>
</if>
<if test="account != null">
and a.account like CONCAT('%', #{account}, '%')
......
src/test/java/com/esv/freight/customer/module/carrier/CarrierAccountControllerTest.java → src/test/java/com/esv/freight/customer/module/carrier/controller/CarrierAccountControllerTest.java
View file @ 2cf02814
package com.esv.freight.customer.module.carrier;
package com.esv.freight.customer.module.carrier.controller;
import com.alibaba.fastjson.JSONObject;
import com.esv.freight.customer.BaseTestController;
import com.esv.freight.customer.common.response.ECode;
import com.esv.freight.customer.module.carrier.CarrierConstants;
import com.esv.freight.customer.module.carrier.form.CarrierInfoForm;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
......@@ -82,20 +83,20 @@ public class CarrierAccountControllerTest extends BaseTestController {
CarrierInfoForm form = new CarrierInfoForm();
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000014");
form.setRoadLicenseNumber("110105000015");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setContactor("张志臣");
form.setAccount("13512340003");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY6D");
form.setCarrierFullName("辽宁省沈阳市恒源物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市恒源物流有限公司");
form.setUniCreditCode("91310107MA1G11CY7D");
form.setCarrierFullName("辽宁省沈阳市奔马物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市奔马物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setLegalPerson("张志臣");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
......@@ -168,7 +169,7 @@ public class CarrierAccountControllerTest extends BaseTestController {
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1011, result.getIntValue("code"));
Assert.assertEquals(1001, result.getIntValue("code"));
}
/**
......@@ -218,7 +219,7 @@ public class CarrierAccountControllerTest extends BaseTestController {
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1012, result.getIntValue("code"));
Assert.assertEquals(1002, result.getIntValue("code"));
}
/**
......@@ -268,7 +269,7 @@ public class CarrierAccountControllerTest extends BaseTestController {
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1013, result.getIntValue("code"));
Assert.assertEquals(1003, result.getIntValue("code"));
}
/**
......@@ -318,6 +319,261 @@ public class CarrierAccountControllerTest extends BaseTestController {
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1014, result.getIntValue("code"));
Assert.assertEquals(1004, result.getIntValue("code"));
}
/**
* 编辑承运商信息
**/
@Test
@Rollback
public void b1_edit_account_company_success_test() throws Exception {
String url = "/carrier/account/edit";
// 构造数据
CarrierInfoForm form = new CarrierInfoForm();
form.setId(2L);
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000014");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY6D");
form.setCarrierFullName("辽宁省沈阳市恒源物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市恒源物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
form.setEmail("test001@163.com");
form.setCreditScore(60);
form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
}
/**
* 编辑承运商信息：无效的帐号ID
**/
@Test
@Rollback
public void b2_edit_account_wrong_id_failure_test() throws Exception {
String url = "/carrier/account/edit";
// 构造数据
CarrierInfoForm form = new CarrierInfoForm();
form.setId(99999L);
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000014");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY6D");
form.setCarrierFullName("辽宁省沈阳市恒源物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市恒源物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
form.setEmail("test001@163.com");
form.setCreditScore(60);
form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1001, result.getIntValue("code"));
}
/**
* 编辑承运商信息：道路运输经营许可证号已存在
**/
@Test
@Rollback
public void b3_edit_account_wrong_roadLicenseNumber_failure_test() throws Exception {
String url = "/carrier/account/edit";
// 构造数据
CarrierInfoForm form = new CarrierInfoForm();
form.setId(2L);
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000013");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY6D");
form.setCarrierFullName("辽宁省沈阳市恒源物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市恒源物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
form.setEmail("test001@163.com");
form.setCreditScore(60);
form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1002, result.getIntValue("code"));
}
/**
* 编辑承运商信息：统一社会信用代码已存在
**/
@Test
@Rollback
public void b4_edit_account_wrong_uniCreditCode_failure_test() throws Exception {
String url = "/carrier/account/edit";
// 构造数据
CarrierInfoForm form = new CarrierInfoForm();
form.setId(2L);
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000014");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY7D");
form.setCarrierFullName("辽宁省沈阳市恒源物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市恒源物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
form.setEmail("test001@163.com");
form.setCreditScore(60);
form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1003, result.getIntValue("code"));
}
/**
* 编辑承运商信息：承运商名称已存在
**/
@Test
@Rollback
public void b5_edit_account_wrong_carrierFullName_failure_test() throws Exception {
String url = "/carrier/account/edit";
// 构造数据
CarrierInfoForm form = new CarrierInfoForm();
form.setId(2L);
form.setCarrierType(CarrierConstants.CARRIER_TYPE_COMPANY);
form.setCarrierVehicleType(1);
form.setRoadLicenseNumber("110105000014");
form.setRoadLicenseUrl("http://127.0.0.1/road_license_001.jpg");
form.setContactor("陈洪艳");
form.setAccount("13512340002");
form.setPassword("e10adc3949ba59abbe56e057f20f883e");
form.setUniCreditCode("91310107MA1G11CY6D");
form.setCarrierFullName("辽宁省沈阳市奔马物流有限公司");
form.setCarrierBriefName("辽宁省沈阳市奔马物流有限公司");
form.setProvinceCode("210000");
form.setCityCode("210100");
form.setDistrictCode("210103");
form.setDetailAddress("沈河区青年大街10号");
form.setLegalPerson("陈洪艳");
form.setBusinessLicenseUrl("http://127.0.0.1/business_license_001.jpg");
form.setBusinessScope("道路货物运输");
form.setRoadLicenseExpireDate("2030年12月31日");
form.setEmail("test001@163.com");
form.setCreditScore(60);
form.setRemark("这是一条测试数据");
JSONObject reqJson = JSONObject.parseObject(form.toString());
MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
.contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
.headers(this.getDefaultHttpHeaders())
.content(reqJson.toJSONString()))
.andDo(MockMvcResultHandlers.print())
.andExpect(MockMvcResultMatchers.status().isOk())
.andReturn();
String responseStr = mvcResult.getResponse().getContentAsString();
log.info(responseStr);
JSONObject result = JSONObject.parseObject(responseStr);
Assert.assertEquals(1004, result.getIntValue("code"));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment