瀏覽代碼

加入删除员工信息功能

wuxw 7 年之前
父節點
當前提交
08aa05d096

+ 41 - 0
StoreService/src/main/java/com/java110/store/listener/AbstractStoreBusinessServiceDataFlowListener.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.StatusConstant;
 import com.java110.common.exception.ListenerExecuteException;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
 import com.java110.store.dao.IStoreServiceDao;
@@ -219,4 +220,44 @@ public abstract class AbstractStoreBusinessServiceDataFlowListener extends Abstr
         currentMemberStore.put("operate",StatusConstant.OPERATE_DEL);
         getStoreServiceDaoImpl().saveBusinessStoreInfo(currentMemberStore);
     }
+
+    /**
+     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
+     * @param businessStoreUser 商户信息
+     */
+    protected void autoSaveDelBusinessStoreUser(Business business, JSONObject businessStoreUser){
+        //自动插入DEL
+        Map info = new HashMap();
+        info.put("storeId",businessStoreUser.getString("storeId"));
+        info.put("userId",businessStoreUser.getString("userId"));
+        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
+        Map currentStoreUser = getStoreServiceDaoImpl().getStoreUser(info).get(0);
+        if(currentStoreUser == null || currentStoreUser.isEmpty()){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息,入参错误或数据有问题,请检查"+info);
+        }
+        currentStoreUser.put("bId",business.getbId());
+        currentStoreUser.put("storeUserId", currentStoreUser.get("store_user_id"));
+        currentStoreUser.put("storeId",currentStoreUser.get("store_id"));
+        currentStoreUser.put("userId",currentStoreUser.get("user_id"));
+        currentStoreUser.put("relCd",currentStoreUser.get("rel_cd"));
+        currentStoreUser.put("operate",StatusConstant.OPERATE_DEL);
+        getStoreServiceDaoImpl().saveBusinessStoreUser(currentStoreUser);
+    }
+
+    /**
+     * 刷新 businessMemberStore 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     * @param businessMemberStore
+     */
+    protected void flushBusinessStoreUser(Map businessMemberStore,String statusCd){
+        businessMemberStore.put("newBId",businessMemberStore.get("b_id"));
+        businessMemberStore.put("storeUserId", businessMemberStore.get("store_user_id"));
+        businessMemberStore.put("storeId",businessMemberStore.get("store_id"));
+        businessMemberStore.put("userId",businessMemberStore.get("user_id"));
+        businessMemberStore.put("relCd",businessMemberStore.get("rel_cd"));
+        businessMemberStore.put("statusCd", statusCd);
+    }
+
+
+
 }

+ 202 - 0
StoreService/src/main/java/com/java110/store/listener/DeleteStoreUserListener.java

@@ -0,0 +1,202 @@
+package com.java110.store.listener;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.constant.StatusConstant;
+import com.java110.common.exception.ListenerExecuteException;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.Business;
+import com.java110.store.dao.IStoreServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 删除商户信息 侦听
+ *
+ * 处理节点
+ * 1、businessStore:{} 商户基本信息节点
+ * 2、businessStoreAttr:[{}] 商户属性信息节点
+ * 3、businessStorePhoto:[{}] 商户照片信息节点
+ * 4、businessStoreCerdentials:[{}] 商户证件信息节点
+ * 协议地址 :https://github.com/java110/MicroCommunity/wiki/%E5%88%A0%E9%99%A4%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
+ * Created by wuxw on 2018/5/18.
+ */
+@Java110Listener("deleteStoreUserListener")
+@Transactional
+public class DeleteStoreUserListener extends AbstractStoreBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteStoreUserListener.class);
+    @Autowired
+    IStoreServiceDao storeServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_STORE_USER;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+
+        //处理 businessStore 节点
+        if(!data.containsKey("businessStoreUser")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"没有businessStoreUser节点");
+        }
+
+        JSONArray businessStoreUsers = data.getJSONArray("businessStoreUser");
+        for(int bIndex = 0 ; bIndex < businessStoreUsers.size();bIndex++) {
+            doBusinessStoreUser(business, businessStoreUsers.getJSONObject(bIndex));
+        }
+    }
+
+    /**
+     * 删除 instance数据
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+
+        JSONObject data = business.getDatas();
+
+        Map info = new HashMap();
+        info.put("bId",business.getbId());
+        info.put("operate", StatusConstant.OPERATE_ADD);
+
+        //物业用户
+        List<Map> businessStoreUsers = storeServiceDaoImpl.getBusinessStoreUser(info);
+        if(businessStoreUsers != null && businessStoreUsers.size() >0){
+            for(Map businessStoreUser : businessStoreUsers) {
+                flushBusinessStoreUser(businessStoreUser,StatusConstant.STATUS_CD_INVALID);
+                storeServiceDaoImpl.updateStoreUserInstance(businessStoreUser);
+            }
+        }
+
+    }
+
+    /**
+     * 撤单
+     * 从business表中查询到DEL的数据 将instance中的数据更新回来
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
+        String bId = business.getbId();
+        //Assert.hasLength(bId,"请求报文中没有包含 bId");
+        Map info = new HashMap();
+        info.put("bId",bId);
+        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
+
+        Map delInfo = new HashMap();
+        delInfo.put("bId",business.getbId());
+        delInfo.put("operate",StatusConstant.OPERATE_DEL);
+        //商户信息
+        List<Map> storeUsers = storeServiceDaoImpl.getStoreUser(info);
+        if(storeUsers != null && storeUsers.size()>0){
+
+            List<Map> businessStoreUsers = storeServiceDaoImpl.getBusinessStoreUser(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessStoreUsers == null || businessStoreUsers.size() ==0 ){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(store_user),程序内部异常,请检查! "+delInfo);
+            }
+            for(Map businessStoreUser : businessStoreUsers) {
+                flushBusinessStoreUser(businessStoreUser,StatusConstant.STATUS_CD_VALID);
+                storeServiceDaoImpl.updateStoreUserInstance(businessStoreUser);
+            }
+        }
+    }
+
+    /**
+     * 处理 businessUser 节点
+     * @param business 总的数据节点
+     * @param businessStore 商户节点
+     */
+    private void doBusinessStoreUser(Business business,JSONObject businessStore){
+
+        Assert.jsonObjectHaveKey(businessStore,"storeId","businessStore 节点下没有包含 storeId 节点");
+        Assert.jsonObjectHaveKey(businessStore,"userId","businessStore 节点下没有包含 userId 节点");
+
+        if(businessStore.getString("storeId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"storeId 错误,不能自动生成(必须已经存在的storeId)"+businessStore);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessStoreUser(business,businessStore);
+    }
+
+
+
+    /**
+     * 保存商户属性信息
+     * @param business 当前业务
+     * @param businessStoreAttrs 商户属性
+     */
+    private void doSaveBusinessStoreAttrs(Business business,JSONArray businessStoreAttrs){
+        JSONObject data = business.getDatas();
+
+        for(int storeAttrIndex = 0 ; storeAttrIndex < businessStoreAttrs.size();storeAttrIndex ++){
+            JSONObject storeAttr = businessStoreAttrs.getJSONObject(storeAttrIndex);
+            Assert.jsonObjectHaveKey(storeAttr,"attrId","businessStoreAttr 节点下没有包含 attrId 节点");
+            if(storeAttr.getString("attrId").startsWith("-")){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+storeAttr);
+            }
+
+            autoSaveDelBusinessStoreAttr(business,storeAttr);
+        }
+    }
+
+
+    /**
+     * 保存 商户证件 信息
+     * @param business 当前业务
+     * @param businessStoreCerdentialses 商户证件
+     */
+    private void doBusinessStoreCerdentials(Business business, JSONArray businessStoreCerdentialses) {
+
+        Map info = null;
+        Map currentStoreCerdentials = null;
+        for(int businessStoreCerdentialsIndex = 0 ; businessStoreCerdentialsIndex < businessStoreCerdentialses.size() ; businessStoreCerdentialsIndex ++) {
+            JSONObject businessStoreCerdentials = businessStoreCerdentialses.getJSONObject(businessStoreCerdentialsIndex);
+            Assert.jsonObjectHaveKey(businessStoreCerdentials, "storeId", "businessStorePhoto 节点下没有包含 storeId 节点");
+
+            if (businessStoreCerdentials.getString("storeCerdentialsId").startsWith("-")) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"storePhotoId 错误,不能自动生成(必须已经存在的storePhotoId)"+businessStoreCerdentials);
+            }
+
+            autoSaveDelBusinessStoreCerdentials(business,businessStoreCerdentials);
+        }
+    }
+
+    public IStoreServiceDao getStoreServiceDaoImpl() {
+        return storeServiceDaoImpl;
+    }
+
+    public void setStoreServiceDaoImpl(IStoreServiceDao storeServiceDaoImpl) {
+        this.storeServiceDaoImpl = storeServiceDaoImpl;
+    }
+}

+ 1 - 1
StoreService/src/main/java/com/java110/store/smo/impl/StoreServiceSMOImpl.java

@@ -54,7 +54,7 @@ public class StoreServiceSMOImpl extends BaseServiceSMO implements IStoreService
                 Assert.hasLength(businessServiceDataFlow.getbId(),"bId 不能为空");
 
                 BusinessServiceDataFlowEventPublishing.multicastEvent(businessServiceDataFlow);
-                Assert.notEmpty(businessServiceDataFlow.getResJson(),"用户服务["+businessServiceDataFlow.getCurrentBusiness().getServiceCode()+"]没有返回内容");
+                Assert.notEmpty(businessServiceDataFlow.getResJson(),"用户服务["+businessServiceDataFlow.getBusinessType()+"]没有返回内容");
             } catch (Exception e) {
                 logger.error("用户信息处理异常",e);
                 throw new SMOException(ResponseConstant.RESULT_PARAM_ERROR,"用户信息处理异常"+e.getMessage());

+ 9 - 2
WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java

@@ -121,10 +121,17 @@ public class StaffServiceSMOImpl extends BaseComponentSMO implements IStaffServi
      */
     @Override
     public ResponseEntity<String> delete(IPageData pd) {
+        ResponseEntity<String> responseEntity = null;
         Assert.jsonObjectHaveKey(pd.getReqData(),"userId","请求报文格式错误或未包含用户ID信息");
         Assert.jsonObjectHaveKey(pd.getReqData(),"storeId","请求报文格式错误或未包含商户ID信息");
-
-        return null;
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        JSONObject newParam = new JSONObject();
+        newParam.put("userId",paramIn.getString("userId"));
+        newParam.put("storeId",paramIn.getString("storeId"));
+        //修改用户信息
+        responseEntity = this.callCenterService(restTemplate,pd,newParam.toJSONString(),
+                ServiceConstant.SERVICE_API_URL+"/api/user.staff.delete", HttpMethod.POST);
+        return responseEntity;
     }
 
     /**

+ 3 - 0
java110-config/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -416,6 +416,9 @@
         <if test="storeId != null and storeId !=''">
             and sc.store_id = #{storeId}
         </if>
+        <if test="userId != null and userId !=''">
+            and sc.user_id = #{userId}
+        </if>
     </select>
 
     <!-- 修改商户用户信息 add by wuxw 2018-07-03 -->