java110 5 vuotta sitten
vanhempi
commit
114f86d19c

+ 31 - 16
java110-bean/src/main/java/com/java110/dto/storehouse/StorehouseDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.storehouse;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,12 +15,15 @@ import java.util.Date;
  **/
 public class StorehouseDto extends PageDto implements Serializable {
 
+    public static final String SH_TYPE_GROUP = "2806";
+    public static final String SH_TYPE_COMMUNITY = "2807";
+
     private String shDesc;
-private String shType;
-private String shObjId;
-private String shId;
-private String shName;
-private String storeId;
+    private String shType;
+    private String shObjId;
+    private String shId;
+    private String shName;
+    private String storeId;
 
 
     private Date createTime;
@@ -30,37 +34,48 @@ private String storeId;
     public String getShDesc() {
         return shDesc;
     }
-public void setShDesc(String shDesc) {
+
+    public void setShDesc(String shDesc) {
         this.shDesc = shDesc;
     }
-public String getShType() {
+
+    public String getShType() {
         return shType;
     }
-public void setShType(String shType) {
+
+    public void setShType(String shType) {
         this.shType = shType;
     }
-public String getShObjId() {
+
+    public String getShObjId() {
         return shObjId;
     }
-public void setShObjId(String shObjId) {
+
+    public void setShObjId(String shObjId) {
         this.shObjId = shObjId;
     }
-public String getShId() {
+
+    public String getShId() {
         return shId;
     }
-public void setShId(String shId) {
+
+    public void setShId(String shId) {
         this.shId = shId;
     }
-public String getShName() {
+
+    public String getShName() {
         return shName;
     }
-public void setShName(String shName) {
+
+    public void setShName(String shName) {
         this.shName = shName;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 

+ 6 - 0
service-api/src/main/java/com/java110/api/bmo/storehouse/impl/StorehouseBMOImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.storehouse.IStorehouseBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.dto.storehouse.StorehouseDto;
 import com.java110.intf.store.IStorehouseInnerServiceSMO;
 import com.java110.po.storehouse.StorehousePo;
 import com.java110.utils.constant.BusinessTypeConstant;
@@ -28,6 +29,11 @@ public class StorehouseBMOImpl extends ApiBaseBMO implements IStorehouseBMO {
 
         paramInJson.put("shId", "-1");
         StorehousePo storehousePo = BeanConvertUtil.covertBean(paramInJson, StorehousePo.class);
+        if (StorehouseDto.SH_TYPE_GROUP.equals(storehousePo.getShType())) {
+            storehousePo.setShObjId(storehousePo.getStoreId());
+        } else {
+            storehousePo.setShObjId(paramInJson.getString("communityId"));
+        }
         super.insert(dataFlowContext, storehousePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_STOREHOUSE);
     }
 

+ 1 - 0
service-api/src/main/java/com/java110/api/listener/resourceStore/SaveStorehouseListener.java

@@ -33,6 +33,7 @@ public class SaveStorehouseListener extends AbstractServiceApiPlusListener {
 
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
         storehouseBMOImpl.addStorehouse(reqJson, context);
     }