优化代码

java110-generator/src/main/resources/web/template_1.json

@@ -1,140 +1,90 @@
 {
-  "templateName": "商品信息",
+  "templateName": "拼团设置",
   "directories": "goods",
-  "templateCode": "product",
-  "templateKey": "productId",
-  "templateKeyName": "商品ID",
-  "searchCode": "productId",
-  "searchName": "商品ID",
+  "templateCode": "groupBuySetting",
+  "templateKey": "settingId",
+  "templateKeyName": "设置ID",
+  "searchCode": "settingId",
+  "searchName": "设置ID",
   "conditions": [
     {
-      "name": "商品名称",
+      "name": "拼团名称",
       "inputType": "input",
-      "code": "prodName",
+      "code": "groupBuyName",
       "whereCondition": "equal"
     },
     {
-      "name": "关键字",
+      "name": "拼团时效",
       "inputType": "input",
-      "code": "keyword",
+      "code": "validHours",
       "whereCondition": "equal"
     },
     {
-      "name": "产品条码",
+      "name": "设置ID",
       "inputType": "input",
-      "code": "barCode",
+      "code": "settingId",
       "whereCondition": "equal"
     }
   ],
   "columns": [
     {
-      "code": "categoryId",
-      "cnCode": "商品大类",
-      "desc": "必填，请填写商品大类",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "商品大类错误",
-      "show": true
-    },
-    {
-      "code": "prodName",
-      "cnCode": "商品名称",
-      "desc": "必填，请填写商品名称",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "maxLength",
-      "limitParam": "128",
-      "limitErrInfo": "商品名称不能超过128位",
-      "show": true
-    },
-    {
-      "code": "prodDesc",
-      "cnCode": "商品简介",
-      "desc": "必填，请填写商品简介",
+      "code": "groupBuyName",
+      "cnCode": "拼团名称",
+      "desc": "必填，请填写拼团名称",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
       "limitParam": "256",
-      "limitErrInfo": "商品简介不能超过256位",
+      "limitErrInfo": "拼团名称不能超过256位",
       "show": true
     },
     {
-      "code": "keyword",
-      "cnCode": "关键词",
-      "desc": "必填，请填写关键词",
+      "code": "groupBuyDesc",
+      "cnCode": "拼团简介",
+      "desc": "必填，请填写拼团简介",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
-      "limitParam": "256",
-      "limitErrInfo": "关键词不能超过256位",
+      "limitParam": "500",
+      "limitErrInfo": "拼团简介不能超过500位",
       "show": true
     },
     {
-      "code": "barCode",
-      "cnCode": "产品条码",
-      "desc": "选填，请填写产品条码",
-      "required": false,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "maxLength",
-      "limitParam": "15",
-      "limitErrInfo": "产品条码不能超过15位",
-      "show": true
-    },
-    {
-      "code": "unitName",
-      "cnCode": "单位",
-      "desc": "选填，请填写单位",
-      "required": false,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "maxLength",
-      "limitParam": "32",
-      "limitErrInfo": "单位不能超过32位",
-      "show": true
-    },
-    {
-      "code": "sort",
-      "cnCode": "排序",
-      "desc": "选填，请填写排序",
-      "required": false,
+      "code": "validHours",
+      "cnCode": "拼团时效",
+      "desc": "必填，请填写拼团时效",
+      "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "num",
       "limitParam": "",
-      "limitErrInfo": "排序格式错误",
+      "limitErrInfo": "拼团时效不是有效数字",
       "show": true
     },
     {
-      "code": "isPostage",
-      "cnCode": "是否包邮",
-      "desc": "选填，请填写排序",
-      "required": false,
+      "code": "startTime",
+      "cnCode": "开始时间",
+      "desc": "必填，请填写开始时间",
+      "required": true,
       "hasDefaultValue": false,
-      "inputType": "select",
-      "selectValue":"1,2",
-      "selectValueName":"包邮,不包邮",
-      "limit": "num",
+      "inputType": "input",
+      "limit": "datetime",
       "limitParam": "",
-      "limitErrInfo": "是否包邮格式错误",
+      "limitErrInfo": "开始时间不是有效日期",
       "show": true
     },
     {
-      "code": "postage",
-      "cnCode": "邮费",
-      "desc": "选填，请填写邮费",
-      "required": false,
+      "code": "endTime",
+      "cnCode": "结束时间",
+      "desc": "必填，请填写结束时间",
+      "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
-      "limit": "money",
+      "limit": "datetime",
       "limitParam": "",
-      "limitErrInfo": "邮费格式错误,请填写如 3.00",
+      "limitErrInfo": "结束时间不是有效日期",
       "show": true
     }
   ]

service-api/src/main/java/com/java110/api/listener/owner/DeleteAppUserBindingOwnerListener.java

@@ -6,6 +6,7 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,12 @@ public class DeleteAppUserBindingOwnerListener extends AbstractServiceApiPlusLis
 
         Assert.hasKeyAndValue(reqJson, "appUserId", "绑定ID不能为空");
 
+        String env = MappingCache.getValue("HC_ENV");
+
+        if ("DEV".equals(env) || "TEST".equals(env)) {
+            throw new IllegalArgumentException("演示环境不能解绑，解绑后演示账号手机端无法登陆");
+        }
+
     }
 
     @Override