优化代码

java110-bean/src/main/java/com/java110/dto/couponKey/CouponKeyDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.couponKey;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,10 @@ import java.util.Date;
 public class CouponKeyDto extends PageDto implements Serializable {
 
     private String name;
-private String keyId;
-private String beanName;
-private String remark;
-private String columnKey;
+    private String keyId;
+    private String beanName;
+    private String remark;
+    private String columnKey;
 
 
     private Date createTime;
@@ -29,31 +30,40 @@ private String columnKey;
     public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getKeyId() {
+
+    public String getKeyId() {
         return keyId;
     }
-public void setKeyId(String keyId) {
+
+    public void setKeyId(String keyId) {
         this.keyId = keyId;
     }
-public String getBeanName() {
+
+    public String getBeanName() {
         return beanName;
     }
-public void setBeanName(String beanName) {
+
+    public void setBeanName(String beanName) {
         this.beanName = beanName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getColumnKey() {
+
+    public String getColumnKey() {
         return columnKey;
     }
-public void setColumnKey(String columnKey) {
+
+    public void setColumnKey(String columnKey) {
         this.columnKey = columnKey;
     }
 

service-acct/src/main/java/com/java110/acct/cmd/couponProperty/SaveCouponPropertyPoolCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.acct.cmd.couponProperty;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -30,6 +31,7 @@ import com.java110.po.couponPropertyPool.CouponPropertyPoolPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,6 +70,28 @@ public class SaveCouponPropertyPoolCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "stock", "请求报文中未包含stock");
         Assert.hasKeyAndValue(reqJson, "validityDay", "请求报文中未包含validityDay");
 
+        if(!reqJson.containsKey("toTypes")){
+            throw new CmdException("未包含用途");
+        }
+
+        JSONArray toTypes = reqJson.getJSONArray("toTypes");
+
+        if(toTypes == null || toTypes.size()< 1){
+            throw new CmdException("未包含用途");
+        }
+
+        JSONObject typeObj = null;
+        for(int typeIndex = 0;typeIndex < toTypes.size(); typeIndex++){
+            typeObj = toTypes.getJSONObject(typeIndex);
+            if(!typeObj.containsKey("columnValue")){
+                throw new CmdException(typeObj.getString("name")+"未填写值");
+            }
+
+            if(StringUtil.isEmpty(typeObj.getString("columnValue"))){
+                throw new CmdException(typeObj.getString("name")+"未填写值");
+            }
+        }
+
     }
 
     @Override
@@ -92,6 +116,8 @@ public class SaveCouponPropertyPoolCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java

@@ -15,6 +15,7 @@ import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
@@ -57,6 +58,9 @@ public class SaveOwnerCmd extends Cmd {
     @Autowired
     private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");

service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java

@@ -16,6 +16,7 @@
 package com.java110.user.smo.impl;
 
 
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.user.dao.IOwnerV1ServiceDao;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.dto.owner.OwnerDto;
@@ -64,6 +65,7 @@ public class OwnerV1InnerServiceSMOImpl extends BaseServiceSMO implements IOwner
     }
 
     @Override
+
     public List<OwnerDto> queryOwners(@RequestBody  OwnerDto ownerDto) {
 
         //校验是否传了 分页信息