浏览代码

实体对象 挪入common

姜永辉 2 年之前
父节点
当前提交
a54de65ab6

+ 4 - 4
src/main/java/com/dk/oauth/controller/CompanyController.java

@@ -42,7 +42,7 @@ public class CompanyController {
      * @date : 2023/1/9 10:49
      */
     @ApiOperation(value = "更新微信用的公司", notes = "更新微信用的公司")
-    @PostMapping({"feign_update_wx_user_company/"})
+    @PostMapping(value = "/feign_update_wx_user_company/")
     public ResponseResultVO<Boolean> updateWxUserCompany(@RequestBody Map<String,Object> map) {
         return companyService.updateWxUserCompany(map);
     }
@@ -53,8 +53,8 @@ public class CompanyController {
      * @date   : 2024/2/1 14:55
      */
     @ApiOperation( value = "注册商户", notes = "注册商户" )
-    @PostMapping({"register_company/{openid}"})
-    public ResponseResultVO<?> registerCompany(@RequestBody Company company, @PathVariable String openid) {
-        return companyService.registerCompany(company,openid);
+    @PostMapping(value = "/register_company")
+    public ResponseResultVO<?> registerCompany(@RequestBody Company company) {
+        return companyService.registerCompany(company);
     }
 }

+ 1 - 1
src/main/java/com/dk/oauth/feign/service/OrgFeign.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1", path = Constant.MST_ORG, contextId = "org")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-jyh", path = Constant.MST_ORG, contextId = "org")
 public interface OrgFeign {
     /**
      * @desc : 注册商户时候插入部门--顶级

+ 7 - 7
src/main/java/com/dk/oauth/feign/service/StaffFeign.java

@@ -15,21 +15,21 @@ import java.util.Map;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1", path = Constant.MST_STAFF,contextId = "staff")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-jyh", path = Constant.MST_STAFF, contextId = "staff")
 public interface StaffFeign {
     /**
-     * @desc   : 体验产品
+     * @desc : 体验产品
      * @author : 姜永辉
-     * @date   : 2023-11-02 16:27
+     * @date : 2023-11-02 16:27
      */
     @PostMapping({"/feign_get_experience"})
-    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> collectQuery) ;
+    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> collectQuery);
 
     /**
-     * @desc   : 注册商户时候插入员工
+     * @desc : 注册商户时候插入员工
      * @author : 姜永辉
-     * @date   : 2023-11-02 16:27
+     * @date : 2023-11-02 16:27
      */
     @PostMapping({"/insert_feign_staff"})
-    ResponseResultVO<StaffResponse> insertFeignStaff(@RequestBody StaffVO staffVO) ;
+    ResponseResultVO<StaffResponse> insertFeignStaff(@RequestBody StaffVO staffVO);
 }

+ 1 - 1
src/main/java/com/dk/oauth/service/ICompanyService.java

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 public interface ICompanyService  extends IService<Company> {
 
-    ResponseResultVO registerCompany(Company company,String openid);
+    ResponseResultVO registerCompany(Company company);
 
     ResponseResultVO selectById(Integer id);
 

+ 1 - 1
src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -79,7 +79,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseResultVO registerCompany(Company company,String openid) {
+    public ResponseResultVO registerCompany(Company company ) {
         Company c = new Company();
         c.setFlgValid(true);
         c.setCpName(company.getCpName());