配置审批

gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java

@@ -77,6 +77,15 @@ public interface StoreDictApiService {
     ServiceResponse saveStoreStatusAndStoreType(Integer enterpriseId, String[] storeStatusArr, String[] storeTypeArr);
 
     /**
+     * @Title: saveStoreStatusAndStoreTypeCallback
+     * @Description: 审批回调
+     * @author zhiwj
+     * @param json
+     * @return com.gic.api.base.commons.ServiceResponse
+     * @throws
+     */
+    ServiceResponse saveStoreStatusAndStoreTypeCallback(String json);
+    /**
      * 查询支持列表查询的自定义字段
      * @param enterpriseId
      * @return

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java

 package com.gic.store.service.outer.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.bizdict.api.dto.BizdictDTO;
 import com.gic.bizdict.api.service.BizdictService;
@@ -18,6 +20,8 @@ import com.gic.store.service.StoreFieldService;
 import com.gic.store.utils.StoreRedisKeyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,10 +30,12 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service("storeDictApiService")
 public class StoreDictApiServiceImpl implements StoreDictApiService {
+
+    private Logger logger = LogManager.getLogger(StoreDictApiServiceImpl.class);
+
     @Autowired
     private StoreDictService storeDictService;
     @Autowired
@@ -151,6 +157,22 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
     }
 
     @Override
+    public ServiceResponse saveStoreStatusAndStoreTypeCallback(String json) {
+        JSONObject jsonObject = JSON.parseObject(json);
+        logger.info("审批回调结果：{}", json);
+        // 审批结果  1:通过    2:不通过
+        Integer auditResult = jsonObject.getInteger("auditResult");
+
+        if (Integer.valueOf(1).equals(auditResult)) {
+            // 审批通过
+            ServiceResponse serviceResponse = saveStoreStatusAndStoreType(
+                    jsonObject.getInteger("enterpriseId"), jsonObject.getString("storeStatus").split(","), jsonObject.getString("storeType").split(","));
+        }
+
+        return ServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "审批未通过");
+    }
+
+    @Override
     public ServiceResponse<List<StoreDictDTO>> listStoreField(Integer enterpriseId) {
         return listStoreField(enterpriseId, false);
     }

gic-store-web/src/main/java/com/gic/store/web/controller/StoreDictController.java

@@ -11,6 +11,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.AuditLogApiService;
 import com.gic.enterprise.service.EnterpriseInitApiService;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.store.constant.StoreESFieldsEnum;
@@ -39,6 +40,7 @@ public class StoreDictController {
     @Autowired
     private AuditLogApiService auditLogApiService;
 
+
     @RequestMapping("list-all-businesscategory")
     @ResponseBody
     public Object listAllBusinessCategory(){
@@ -134,15 +136,31 @@ public class StoreDictController {
     @RequestMapping("save-status-type")
     @ResponseBody
     public RestResponse saveStoreStatusAndStoreType(String storeStatus, String storeType){
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        ServiceResponse serviceResponse = this.storeDictApiService.saveStoreStatusAndStoreType(enterpriseId, storeStatus.split(","), storeType.split(","));
-        if(serviceResponse.isSuccess()){
-            LogUtils.createLog("配置商户门店类型和门店状态", "门店状态和门店类型");
-            this.enterpriseInitApiService.setStoreStatusAndType(enterpriseId);
-            return RestResponse.success();
-        }else {
-            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
-        }
+        AuditLogDTO auditLogDTO = new AuditLogDTO();
+        // 商户id
+        auditLogDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        // 申请人id
+        auditLogDTO.setApplyUserId(UserDetailUtils.getUserDetail().getUserId());
+        // 申请的受审项 在运营平台配置
+        auditLogDTO.setProjectItemCode(Constants.PROJECT_ITEM_SAVE_STATUS_TYPE_APPLY);
+        // 额外信息 必须是json
+        JSONObject jsonObject = new JSONObject();
+        // 自定义的信息
+        jsonObject.put("enterpriseId", UserDetailUtils.getUserDetail().getEnterpriseId());
+        jsonObject.put("storeStatus", storeStatus);
+        jsonObject.put("storeType", storeType);
+        auditLogDTO.setExtraInfo(jsonObject.toJSONString());
+        ServiceResponse<Void> serviceResponse = auditLogApiService.apply(auditLogDTO);
+        return ResultControllerUtils.commonResult(serviceResponse);
+//        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+//        ServiceResponse serviceResponse = this.storeDictApiService.saveStoreStatusAndStoreType(enterpriseId, storeStatus.split(","), storeType.split(","));
+//        if(serviceResponse.isSuccess()){
+//            LogUtils.createLog("配置商户门店类型和门店状态", "门店状态和门店类型");
+//            this.enterpriseInitApiService.setStoreStatusAndType(enterpriseId);
+//            return RestResponse.success();
+//        }else {
+//            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+//        }
     }