新建商户和超级管理员

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/EnterpriseApiService.java

@@ -30,4 +30,18 @@ public interface EnterpriseApiService {
      * @return
      */
     ServiceResponse<EnterpriseDTO> getEnterpriseById(Integer enterpriseId);
+
+    /**
+     * 停用
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse disableEnterprise(Integer enterpriseId);
+
+    /**
+     * 启用
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse enableEnterprise(Integer enterpriseId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/EnterpriseService.java

@@ -36,4 +36,11 @@ public interface EnterpriseService {
      * @return
      */
     boolean isRepeatEnterpriseName(String enterpriseName, Integer enterpriseId);
+
+    /**
+     * 停用、启用
+     * @param enterpriseId
+     * @param status
+     */
+    void changeEnterpriseStatus(Integer enterpriseId, Integer status);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/EnterpriseServiceImpl.java

@@ -43,4 +43,12 @@ public class EnterpriseServiceImpl implements EnterpriseService{
         }
         return false;
     }
+
+    @Override
+    public void changeEnterpriseStatus(Integer enterpriseId, Integer status) {
+        TabEnterprise tabEnterprise = new TabEnterprise();
+        tabEnterprise.setEnterpriseId(enterpriseId);
+        tabEnterprise.setStatus(status);
+        tabEnterpriseMapper.updateByPrimaryKeySelective(tabEnterprise);
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/EnterpriseApiServiceImpl.java

@@ -69,8 +69,28 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     public ServiceResponse<EnterpriseDTO> getEnterpriseById(Integer enterpriseId) {
         TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
         if (tabEnterprise == null) {
-            ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "企业ID错误，查询不到数据");
+            ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID输入有误");
         }
         return ServiceResponse.success(EntityUtil.changeEntityNew(EnterpriseDTO.class, tabEnterprise));
     }
+
+    @Override
+    public ServiceResponse disableEnterprise(Integer enterpriseId) {
+        TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
+        if (tabEnterprise == null) {
+            ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID输入有误");
+        }
+        enterpriseService.changeEnterpriseStatus(enterpriseId, EnterpriseStatusTypeEnum.DISABLE.getCode());
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse enableEnterprise(Integer enterpriseId) {
+        TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
+        if (tabEnterprise == null) {
+            ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID输入有误");
+        }
+        enterpriseService.changeEnterpriseStatus(enterpriseId, EnterpriseStatusTypeEnum.EFFECTIVE.getCode());
+        return ServiceResponse.success();
+    }
 }

gic-platform-operation-web/pom.xml

@@ -80,6 +80,16 @@
             <version>${gic-enterprise-base-api}</version>
         </dependency>
         <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-auth-api</artifactId>
+            <version>${gic-enterprise-base-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-enterprise-api</artifactId>
+            <version>${gic-enterprise-base-api}</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.1.5.RELEASE</version>

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

+package com.gic.operation.web.controller;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.constant.UserConstants;
+import com.gic.auth.dto.UserDTO;
+import com.gic.auth.exception.StoreException;
+import com.gic.auth.service.UserApiService;
+import com.gic.auth.utils.CreatePasswordAutoUtil;
+import com.gic.commons.util.Md5Util;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.dto.EnterpriseDTO;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseRestResponse;
+import com.gic.enterprise.service.EnterpriseApiService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author guojx
+ * @date 2019/7/17 10:32 AM
+ */
+@RestController
+@RequestMapping("/enterprise")
+public class EnterpriseController {
+    private static final Logger LOGGER = LoggerFactory.getLogger(EnterpriseController.class);
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
+    @Autowired
+    private UserApiService userApiService;
+
+    @RequestMapping("/save-enterprise")
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse saveEnterprise(@Validated({EnterpriseDTO.SaveEnterpriseValid.class}) EnterpriseDTO enterpriseDTO,
+                                       @Validated({UserDTO.SaveUserValid.class}) UserDTO userDTO) {
+        ServiceResponse<Integer> enterpriseResult = enterpriseApiService.saveEnterprise(enterpriseDTO);
+        if (enterpriseResult.isSuccess()) {
+            int enterpriseId = enterpriseResult.getResult();
+            userDTO.setEnterpriseId(enterpriseId);
+            int passwordType = userDTO.getPasswordType();
+            //加密
+            if (UserConstants.CREATE_AUTO == passwordType) {
+                //自动随机生成
+               userDTO.setPassword(encryptPassword(CreatePasswordAutoUtil.getStringRandom(8)));
+            } else {
+                if (userDTO.getPassword().equals(userDTO.getConfirmPassword())) {
+                    //如果一致
+                    userDTO.setPassword(encryptPassword(userDTO.getPassword()));
+                } else {
+                    RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "密码不一致");
+                }
+            }
+            //新增
+            ServiceResponse userResult = userApiService.saveUser(userDTO);
+            if (userResult.isSuccess()) {
+                return RestResponse.success();
+            } else {
+                //回滚
+                throw new StoreException(userResult.getCode(), userResult.getMessage());
+            }
+        } else {
+            return EnterpriseRestResponse.failure(enterpriseResult);
+        }
+    }
+
+    private static String encryptPassword(String password) {
+        Md5Util md5 = new Md5Util();
+        return md5.encrypt(password + password);
+    }
+}

gic-platform-operation-web/src/main/resources/dubbo-gic-platform-operation-web.xml

@@ -35,4 +35,9 @@
     <dubbo:reference interface="com.gic.store.service.ProvincesApiService" id="provincesApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.StoreStatusSettingApiService" id="storeStatusSettingApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="60000" />
+
+    <!--用户-->
+    <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="60000" />
+    <!--商户-->
+    <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="60000" />
 </beans>
\ No newline at end of file