diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Company.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Company.java index 376ae42..75087eb 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Company.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Company.java @@ -66,7 +66,7 @@ public class Company { /** *社会统一信用代码 */ - private String USCI; + private String usci; /** *企业营业执照 */ @@ -95,7 +95,7 @@ public class Company { .registrantPhone(companyListReq.getRegistrantPhone()) .registrantPosition(companyListReq.getRegistrantPhone()) .registrantDate(companyListReq.getRegistrantDate()) - .USCI(companyListReq.getUSCI()) + .usci(companyListReq.getUsci()) .businessLicense(companyListReq.getBusinessLicense()) .companyAddress(companyListReq.getCompanyAddress()) .reviewStatus(companyListReq.getReviewStatus()) diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/CompanyListReq.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/CompanyListReq.java index 70f4a70..c3f8d5e 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/CompanyListReq.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/CompanyListReq.java @@ -53,7 +53,7 @@ public class CompanyListReq { /** *社会统一信用代码 */ - private String USCI; + private String usci; /** *企业营业执照 */ diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/UserMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/UserMapper.java index ead0ccb..4384626 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/UserMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/UserMapper.java @@ -3,6 +3,7 @@ package com.muyu.cloud.market.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.cloud.market.domin.User; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @Author:weiran @@ -13,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UserMapper extends BaseMapper { + void updcompanyId(@Param("userid") Long userid, @Param("companyId") Integer companyId); } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/UserService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/UserService.java index f89efd0..2e98c07 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/UserService.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/UserService.java @@ -27,4 +27,6 @@ public interface UserService extends IService { * @return */ String sendcode(String email); + + void updcompanyId(Long userid, Integer companyId); } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/CompanyServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/CompanyServiceImpl.java index ca25fa0..9b41586 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/CompanyServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/CompanyServiceImpl.java @@ -54,7 +54,7 @@ public class CompanyServiceImpl extends ServiceImpl impl } Long userid = loginUser.getUserid(); User user = userService.getById(userid); - if (user.getIsCompanyid()!=null || user.getIsCompanyid()!=0){ + if (user.getIsCompanyid()!=null && user.getIsCompanyid()!=0){ throw new RuntimeException("已绑定,若要重新绑定,请先解除绑定"); } @@ -69,8 +69,8 @@ public class CompanyServiceImpl extends ServiceImpl impl this.save(company); Integer companyId = company.getCompanyId(); - user.setIsCompanyid(companyId); - userService.updateById(user); + userService.updcompanyId(userid,companyId); + } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/UserServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/UserServiceImpl.java index d583de2..bf2cf1e 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/UserServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/UserServiceImpl.java @@ -110,4 +110,9 @@ public class UserServiceImpl extends ServiceImpl implements co return code; } + + @Override + public void updcompanyId(Long userid, Integer companyId) { + userMapper.updcompanyId(userid,companyId); + } } diff --git a/cloud-market-server/src/main/resources/mapper/market/UserMapper.xml b/cloud-market-server/src/main/resources/mapper/market/UserMapper.xml new file mode 100644 index 0000000..8ea54e6 --- /dev/null +++ b/cloud-market-server/src/main/resources/mapper/market/UserMapper.xml @@ -0,0 +1,11 @@ + + + + + + + update sys_user set is_companyid=#{companyId} where user_id=#{userid} + +