From 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 02 十一月 2023 14:09:04 +0800
Subject: [PATCH] 1、优化查询,便于模糊查询条件2、界面查询条件调整

---
 service-store/src/main/java/com/java110/store/cmd/resourceSupplier/UpdateResourceSupplierCmd.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceSupplier/UpdateResourceSupplierCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceSupplier/UpdateResourceSupplierCmd.java
index 8245d65..161dc65 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceSupplier/UpdateResourceSupplierCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceSupplier/UpdateResourceSupplierCmd.java
@@ -31,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * 绫昏〃杩帮細鏇存柊
  * 鏈嶅姟缂栫爜锛歳esourceSupplier.updateResourceSupplier
@@ -47,7 +46,6 @@
 
   private static Logger logger = LoggerFactory.getLogger(UpdateResourceSupplierCmd.class);
 
-
     @Autowired
     private IResourceSupplierV1InnerServiceSMO resourceSupplierV1InnerServiceSMOImpl;
 
@@ -57,6 +55,13 @@
         Assert.hasKeyAndValue(reqJson, "supplierName", "璇锋眰鎶ユ枃涓湭鍖呭惈supplierName");
         Assert.hasKeyAndValue(reqJson, "address", "璇锋眰鎶ユ枃涓湭鍖呭惈address");
         Assert.hasKeyAndValue(reqJson, "tel", "璇锋眰鎶ユ枃涓湭鍖呭惈tel");
+        Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+        String regex = "1[3-9]\\d{9}";
+        String regex2 = "0\\d{2,3}-?[1-9]\\d{4,9}";
+        String tel = reqJson.getString("tel"); //鑾峰彇鎵嬫満鍙�
+        if (!tel.matches(regex) && !tel.matches(regex2)) {
+            throw new IllegalArgumentException("渚涘簲鍟嗚仈绯绘柟寮忔牸寮忎笉瀵癸紒");
+        }
         if (!reqJson.containsKey("storeId")) {
             String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
             reqJson.put("storeId", storeId);
@@ -64,26 +69,19 @@
         if (!reqJson.containsKey("userId")) {
             reqJson.put("userId", "-1");
         }
-
         if (!reqJson.containsKey("userName")) {
             reqJson.put("userName", "鏈煡");
         }
-
-        Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
-
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
        ResourceSupplierPo resourceSupplierPo = BeanConvertUtil.covertBean(reqJson, ResourceSupplierPo.class);
         int flag = resourceSupplierV1InnerServiceSMOImpl.updateResourceSupplier(resourceSupplierPo);
-
         if (flag < 1) {
             throw new CmdException("鏇存柊鏁版嵁澶辫触");
         }
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0