优化商户ID判断

Api/src/main/java/com/java110/api/listener/resourceStore/DeleteResourceStoreListener.java

@@ -28,6 +28,7 @@ public class DeleteResourceStoreListener extends AbstractServiceApiListener {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "resId", "物品ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "storeId", "商户信息不能为空");
 
     }
 

Api/src/main/java/com/java110/api/listener/resourceStore/SaveResourceStoreListener.java

@@ -13,8 +13,6 @@ import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ServiceCodeResourceStoreConstant;
 
 
-
-
 import com.java110.core.annotation.Java110Listener;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -31,10 +29,11 @@ public class SaveResourceStoreListener extends AbstractServiceApiListener {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "resName", "必填，请填写物品名称");
-Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
-Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
-Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
-Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户信息");
+        Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
+        Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
+        Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
+        Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
 
     }
 

Api/src/main/java/com/java110/api/listener/resourceStore/UpdateResourceStoreListener.java

@@ -26,11 +26,12 @@ public class UpdateResourceStoreListener extends AbstractServiceApiListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "resId", "物品ID不能为空");
-Assert.hasKeyAndValue(reqJson, "resName", "必填，请填写物品名称");
-Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
-Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
-Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
-Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
+        Assert.hasKeyAndValue(reqJson, "resName", "必填，请填写物品名称");
+        Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
+        Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
+        Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
+        Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
+        Assert.hasKeyAndValue(reqJson, "storeId", "商户信息不能为空");
 
     }
 

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/AddResourceStoreSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.web.smo.resourceStore.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
@@ -44,7 +45,9 @@ public class AddResourceStoreSMOImpl extends AbstractComponentSMO implements IAd
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        paramIn.put("storeId",result.getStoreId());
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/resourceStore.saveResourceStore",

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/DeleteResourceStoreSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.web.smo.resourceStore.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
@@ -39,7 +40,9 @@ public class DeleteResourceStoreSMOImpl extends AbstractComponentSMO implements
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        paramIn.put("storeId",result.getStoreId());
+
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/resourceStore.deleteResourceStore",

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.web.smo.resourceStore.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
@@ -36,6 +37,7 @@ public class EditResourceStoreSMOImpl extends AbstractComponentSMO implements IE
         Assert.hasKeyAndValue(paramIn, "description", "必填，请填写描述");
 
 
+
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_RESOURCESTORE);
 
     }
@@ -43,7 +45,8 @@ public class EditResourceStoreSMOImpl extends AbstractComponentSMO implements IE
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        paramIn.put("storeId",result.getStoreId());
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/resourceStore.updateResourceStore",

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/ListResourceStoresSMOImpl.java

@@ -45,6 +45,7 @@ public class ListResourceStoresSMOImpl extends AbstractComponentSMO implements I
 
         Map paramMap = BeanConvertUtil.beanCovertMap(result);
         paramIn.putAll(paramMap);
+        paramIn.put("storeId",result.getStoreId());
 
         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listResourceStores" + mapToUrlParam(paramIn);
 

java110-db/db/StoreService/create_resource.sql

@@ -30,6 +30,7 @@ CREATE TABLE `business_resource_store` (
 create table resource_order(
 	res_order_id varchar(30) not null comment '订单ID',
 	`b_id` varchar(30) NOT NULL COMMENT '业务Id',
+	`store_id` VARCHAR(30) NOT NULL COMMENT '商户ID',
 	res_order_type varchar(8) not null comment '出库类型 10000 入库 20000 出库 在t_dict表查看',
 	state varchar(8) not null comment '审核状态',
 	`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -41,6 +42,7 @@ create table resource_order(
 create table business_resource_order(
 	res_order_id varchar(30) not null comment '订单ID',
 	`b_id` varchar(30) NOT NULL COMMENT '业务Id',
+	`store_id` VARCHAR(30) NOT NULL COMMENT '商户ID',
 	res_order_type varchar(8) not null comment '出库类型 10000 入库 20000 出库 在t_dict表查看',
 	state varchar(8) not null comment '审核状态',
 	`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -52,9 +54,10 @@ create table resource_item(
 	res_item_id varchar(30) not null comment '订单项ID',
 	res_order_id varchar(30) not null comment '订单ID',
 	`b_id` varchar(30) NOT NULL COMMENT '业务Id',
+	`store_id` VARCHAR(30) NOT NULL COMMENT '商户ID',
 	`res_id` varchar(30) NOT NULL COMMENT '资源ID',
   `res_count` int(11) DEFAULT NULL COMMENT '数量',
-	remark varchar(200) comment '备注'
+	remark varchar(200) comment '备注',
 	`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 	status_cd varchar(2) not null default '0' COMMENT '数据状态，详细参考t_dict表，0, 在用 1失效'
 );
@@ -65,6 +68,7 @@ create table business_resource_item(
 	res_item_id varchar(30) not null comment '订单项ID',
 	res_order_id varchar(30) not null comment '订单ID',
 	`b_id` varchar(30) NOT NULL COMMENT '业务Id',
+	`store_id` VARCHAR(30) NOT NULL COMMENT '商户ID',
 	`res_id` varchar(30) NOT NULL COMMENT '资源ID',
   `res_count` int(11) DEFAULT NULL COMMENT '数量',
 	remark varchar(200) comment '备注',