顾客信息进行调整

sto/src/main/java/com/shinsoft/sto/controller/main/CustomerController.java

@@ -2,7 +2,7 @@ package com.shinsoft.sto.controller.main;
 
 import com.shinsoft.tools.JSONTools;
 import com.shinsoft.tools.model.common.ResponseCodeMsg;
-import com.shinsoft.tools.model.common.ResultJSON;
+import com.shinsoft.sto.model.system.ResultJSON;
 import com.shinsoft.sto.service.main.CustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +32,7 @@ public class CustomerController {
             resultJSON = customerService.query(page, rows, customerNm, map);
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
         } finally {
             return resultJSON;
         }
@@ -45,7 +45,7 @@ public class CustomerController {
             resultJSON = customerService.queryByPK(id);
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
         } finally {
             return resultJSON;
         }
@@ -55,9 +55,10 @@ public class CustomerController {
     public ResultJSON save(String json, HttpServletRequest request) {
         try {
             String userId = (String) request.getHeader("userId");
-            resultJSON = customerService.save(userId, json);
+            String belongId = (String) request.getHeader("beongId");
+            resultJSON = customerService.save(userId,belongId, json);
         } catch (Exception ex) {
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
             ex.printStackTrace();
         } finally {
             return resultJSON;
@@ -71,7 +72,7 @@ public class CustomerController {
             resultJSON = customerService.remove(userId, id);
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
         } finally {
             return resultJSON;
         }
@@ -84,7 +85,7 @@ public class CustomerController {
             resultJSON = customerService.removeBatch(userId, ids);
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
         } finally {
             return resultJSON;
         }
@@ -98,7 +99,7 @@ public class CustomerController {
             resultJSON = customerService.querySelect(belongId);
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            //resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
         } finally {
             return resultJSON;
         }

sto/src/main/java/com/shinsoft/sto/mapper/main/CustomerMapper.java

@@ -14,4 +14,6 @@ public interface CustomerMapper extends BaseMapper<Customer> {
      * 查询客户下拉框数据
      */
     List<selectModel> selectCustomerOptions(@Param("belongId") String belongId);
+
+    List<Customer> selectByName(@Param("customerNm") String customerNm,@Param("customerShortNm") String customerShortNm,@Param("belongId") String belongId);
 }

sto/src/main/java/com/shinsoft/sto/mapper/main/CustomerMapper.xml

@@ -22,15 +22,6 @@
         <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP"/>
         <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR"/>
         <result column="belong_id" property="belongId" jdbcType="VARCHAR"/>
-        <result column="customer_name" property="customerName" jdbcType="VARCHAR"/>
-        <result column="customer_abbreviation" property="customerAbbreviation" jdbcType="VARCHAR"/>
-        <result column="customer_contact" property="customerContact" jdbcType="VARCHAR"/>
-        <result column="contact_information" property="contactInformation" jdbcType="VARCHAR"/>
-        <result column="default_address" property="defaultAddress" jdbcType="VARCHAR"/>
-        <result column="remarks" property="remarks" jdbcType="VARCHAR"/>
-        <result column="active_status" property="activeStatus" jdbcType="VARCHAR"/>
-        <result column="operation" property="operation" jdbcType="VARCHAR"/>
-        <result column="test" property="test" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -43,7 +34,7 @@
     <select id="selectCustomerPage" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from STO_MAIN_CUSTOMER
+        from T_MAIN_CUSTOMER
         where nvl(cancel_flag,'0') = '0'
         and belong_id = #{belongId}
         <if test="query != null and query != ''">
@@ -58,7 +49,7 @@
     <select id="selectByCustomerName" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from STO_MAIN_CUSTOMER
+        from T_MAIN_CUSTOMER
         where nvl(cancel_flag,'0') = '0'
         and belong_id = #{belongId}
         and customer_name = #{customerName}
@@ -73,5 +64,14 @@
 
         ORDER BY add_time DESC
     </select>
+    <select id="selectByName" resultType="com.shinsoft.sto.model.main.Customer">
+        select * from T_MAIN_CUSTOMER WHERE nvl(cancel_flag,'0') = '0'
+        <if test="belongId!=null and belongId !=''">
+            AND belong_id = #{belongId}
+        </if>
+        and (customer_nm = #{customerNm}
+                or customer_short_nm = #{customerShortNm})
+
+    </select>
 
 </mapper>

sto/src/main/java/com/shinsoft/sto/service/impl/main/CustomerServiceImp.java

@@ -12,7 +12,7 @@ import com.shinsoft.sto.model.main.Customer;
 import com.shinsoft.sto.service.main.CustomerService;
 import com.shinsoft.tools.JSONTools;
 import com.shinsoft.tools.model.common.ResponseCodeMsg;
-import com.shinsoft.tools.model.common.ResultJSON;
+import com.shinsoft.sto.model.system.ResultJSON;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,35 +61,41 @@ public class CustomerServiceImp extends ServiceImpl<CustomerMapper, Customer> im
         }
         
         Page<Customer> list = customerMapper.selectPage(customerPage, queryWrapper);
-        resultJSON = JSONTools.toResultJSON(list);
+        resultJSON = ResultJSON.success(list);
         return resultJSON;
     }
 
     @Override
     public ResultJSON queryByPK(String id) {
         Customer customer = customerMapper.selectById(id);
-        resultJSON = JSONTools.toResultJSON(customer);
+        resultJSON = ResultJSON.success(customer);
         return resultJSON;
     }
 
     @Override
-    public ResultJSON save(String userId, String json) {
+    public ResultJSON save(String userId,String belongId, String json) {
         Date date = new Date();
+        boolean success;
         Customer customer = JSON.parseObject(json, new TypeReference<Customer>() {
         });
         if (StringUtils.isEmpty(customer.getId())) {
+            //增加插入校验，相同客户名称的信息只能保存一条
+            //增加限制的原因为：入库批量导入的时候使用到的客户名称进行查询赋值，如果出现两条一样的会出现错误
             customer.setCancelFlag("0");
             customer.setAddId(userId);
             customer.setAddTime(date);
-            customerMapper.insert(customer);
+
+            List<Customer> customers = customerMapper.selectByName(customer.getCustomerNm(), customer.getCustomerShortNm(), belongId);
+            if (customers != null && !customers.isEmpty()) {
+                return ResultJSON.error("客户名称或简称已存在，请勿重复添加");
+            }
+            success = customerMapper.insert(customer)> 0;
         } else {
             customer.setModifyId(userId);
             customer.setModifyTime(date);
-            customerMapper.updateById(customer);
+            success = customerMapper.updateById(customer)> 0;
         }
-
-        resultJSON = JSONTools.toResultJSON(customer);
-        return resultJSON;
+        return success ? ResultJSON.success("新增成功") : ResultJSON.error("新增失败");
     }
 
     @Override
@@ -100,7 +106,7 @@ public class CustomerServiceImp extends ServiceImpl<CustomerMapper, Customer> im
         customer.setModifyId(userId);
         customer.setModifyTime(date);
         customerMapper.updateById(customer);
-        resultJSON = JSONTools.toResultJSON("");
+        resultJSON = ResultJSON.success("");
         return resultJSON;
     }
 
@@ -117,7 +123,7 @@ public class CustomerServiceImp extends ServiceImpl<CustomerMapper, Customer> im
             customer.setModifyTime(date);
             customerMapper.updateById(customer);
         }
-        resultJSON = JSONTools.toResultJSON("");
+        resultJSON = ResultJSON.success("");
         return resultJSON;
     }
 
@@ -125,11 +131,11 @@ public class CustomerServiceImp extends ServiceImpl<CustomerMapper, Customer> im
     public ResultJSON querySelect(String belongId) {
         try {
             List<selectModel> list = customerMapper.selectCustomerOptions(belongId);
-            resultJSON = JSONTools.toResultJSON(list);
+            resultJSON = ResultJSON.success(list);
             return resultJSON;
         } catch (Exception ex) {
             ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            resultJSON = ResultJSON.error("查询失败");
             return resultJSON;
         }
     }

sto/src/main/java/com/shinsoft/sto/service/main/CustomerService.java

@@ -2,7 +2,7 @@ package com.shinsoft.sto.service.main;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.shinsoft.sto.model.main.Customer;
-import com.shinsoft.tools.model.common.ResultJSON;
+import com.shinsoft.sto.model.system.ResultJSON;
 
 import java.util.List;
 import java.util.Map;
@@ -21,7 +21,7 @@ public interface CustomerService extends IService<Customer> {
 
     ResultJSON queryByPK(String id);
 
-    ResultJSON save(String userId, String json);
+    ResultJSON save(String userId,String belongId, String json);
 
     ResultJSON remove(String userId, String id);