5月2日系统修改完成 1.0

src/main/java/com/th/demo/controller/maint/CustomerController.java

@@ -116,4 +116,20 @@ public class CustomerController {
         }
     }
 
+    @RequestMapping(value = "/queryByUserId.do")//查询方法 前两个参数是分页参数
+    public String queryByUserId(String fId,
+                                HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = customerService.queryByUserId(userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
 }

src/main/java/com/th/demo/controller/maint/PriceController.java

@@ -22,14 +22,13 @@ public class PriceController {
     @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
     public String query(int page,
                         int rows,
-                        String materialName,
-                        String standard,
+                        String customerName,
                         HttpServletRequest request) {
 
         try {
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
-            result = priceService.query(page, rows,materialName,standard, userId,belongId);
+            result = priceService.query(page, rows,customerName, userId,belongId);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

src/main/java/com/th/demo/mapping/maint/CustomerMapper.java

@@ -24,4 +24,6 @@ public interface CustomerMapper {
     Customer selectByName(String customerName, String belongId);
 
     List<Customer> selectByNameCode(String customerName, String customerCode, String belongId);
+
+    List<Customer> selectByUserId(String userId, String belongId);
 }

src/main/java/com/th/demo/mapping/maint/PriceMapper.java

@@ -21,7 +21,9 @@ public interface PriceMapper {
 
     Price selectByMaterialChangeTime(String materialId, int changeTime,String belongId);
 
-    List<Price> select(String materialName, String standard, String belongId);
+    List<Price> select(String materialName, String belongId);
+
+    List<Price> selectListByCustomer(String materialName, String belongId);
 
     int selectCntByMaterialChangeTime(String id, int i, String belongId);
 

src/main/java/com/th/demo/model/maint/Price.java

@@ -31,7 +31,12 @@ public class Price {
 
     private String belongId;
 
-    private String   storageType;
+    private String storageType;
+
+    private Customer customer;
+    private double keepDay;
+    private double ordPrice;
+    private double outOrdPrice;
 
     public String getId() {
         return id;
@@ -144,4 +149,36 @@ public class Price {
     public void setStorageType(String storageType) {
         this.storageType = storageType;
     }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+
+    public double getKeepDay() {
+        return keepDay;
+    }
+
+    public void setKeepDay(double keepDay) {
+        this.keepDay = keepDay;
+    }
+
+    public double getOrdPrice() {
+        return ordPrice;
+    }
+
+    public void setOrdPrice(double ordPrice) {
+        this.ordPrice = ordPrice;
+    }
+
+    public double getOutOrdPrice() {
+        return outOrdPrice;
+    }
+
+    public void setOutOrdPrice(double outOrdPrice) {
+        this.outOrdPrice = outOrdPrice;
+    }
 }

src/main/java/com/th/demo/service/impl/maint/CustomerServiceImpl.java

@@ -143,4 +143,12 @@ public class CustomerServiceImpl implements CustomerService {
         num += customerAddressMapper.updateByPrimaryKey(customerAddress);
         return Tools.moreThanZeroResultJSON(num);
     }
+
+    @Transactional
+    @Override
+    public String queryByUserId(String userId, String belongId) {
+
+        List<Customer> list = customerMapper.selectByUserId(userId, belongId);
+        return JSONTools.toString(list);
+    }
 }

src/main/java/com/th/demo/service/impl/maint/PriceServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.PriceMapper;
 import com.th.demo.mapping.maint.ProdPriceMapper;
+import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Price;
 import com.th.demo.model.maint.ProdPrice;
 import com.th.demo.model.system.SysUser;
@@ -31,9 +32,9 @@ public class PriceServiceImpl implements PriceService {
     int num = 0;
 
     @Override
-    public String query(int page, int rows, String materialName,String standard, String userId, String belongId) {
+    public String query(int page, int rows, String customerName, String userId, String belongId) {
         PageHelper.startPage(page, rows);
-        List<Price> list = priceMapper.select(  materialName,standard, belongId);
+        List<Price> list = priceMapper.select(customerName, belongId);
         PageInfo<Price> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;
@@ -43,12 +44,9 @@ public class PriceServiceImpl implements PriceService {
     public String save(String json, String userId, String belongId) {
         Price price = JSON.parseObject(json,new TypeReference<Price>(){});
         if(price.getId()==null||price.getId().equals("")){
-            int priceCnt = priceMapper.selectCntByMaterialChangeTime(price.getMaterial().getId(),Integer.parseInt(price.getStorageType()) , belongId);
-            if(priceCnt > 0){
-                result = JSONTools.toStringyyyyMMddHHmmss(0);
-                result = "已存在该价格信息";
-
-                return result;
+            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getId(),belongId);
+            if (priceList.size() >= 1){
+                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
             }
             price.setAddUser(new SysUser(userId));
             price.setAddTime(new Date());
@@ -58,6 +56,12 @@ public class PriceServiceImpl implements PriceService {
             price.setBelongId(belongId);
             num += priceMapper.insert(price);
         }else {
+            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getName(),belongId);
+            if (priceList.size() == 1 && !price.getId().equals(priceList.get(0).getId())){
+                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
+            } else if (priceList.size() > 1) {
+                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
+            }
             price.setModifyUser(new SysUser(userId));
             price.setModifyTime(new Date());
             num += priceMapper.updateByPrimaryKey(price);

src/main/java/com/th/demo/service/maint/CustomerService.java

@@ -12,4 +12,6 @@ public interface CustomerService {
     String saveAddress(String json, String userId, String belongId);
 
     String defaultAddress(String json, String userId, String belongId);
+
+    String queryByUserId(String userId, String belongId);
 }

src/main/java/com/th/demo/service/maint/PriceService.java

@@ -1,7 +1,7 @@
 package com.th.demo.service.maint;
 
 public interface PriceService {
-    String query(int page, int rows, String materialName, String standard, String userId, String belongId);
+    String query(int page, int rows, String customerName, String userId, String belongId);
 
     String save(String json, String userId, String belongId);
 

src/main/resource/mapper/maint/CustomerMapper.xml

@@ -229,4 +229,11 @@
       and ifnull(cancel_flag,'0') = '0'
   </select>
 
+  <select id="selectByUserId" resultMap="BaseResultMap" >
+    select *
+    from t_maint_customer
+    where belong_id = #{param2,jdbcType=VARCHAR}
+      and ifnull(cancel_flag,'0') = '0'
+  </select>
+
 </mapper>

src/main/resource/mapper/maint/PriceMapper.xml

@@ -15,15 +15,20 @@
     <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="keep_day" property="keepDay" jdbcType="DOUBLE" />
+    <result column="ord_price" property="ordPrice" jdbcType="DOUBLE" />
+    <result column="out_ord_price" property="outOrdPrice" jdbcType="DOUBLE" />
 
       <association  column="material_id" property="material" select="com.th.demo.mapping.maint.MaterialMapper.selectByPrimaryKey" />
       <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
     <association  column="modify_id" property="modifyUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
+    <association  column="customer_id" property="customer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
 
   </resultMap>
   <sql id="Base_Column_List" >
     id, material_id, storage_price,transfer_price, weight_price, add_id, add_time,
-    modify_id, modify_time, cancel_id, cancel_time, cancel_flag, belong_id,storage_type
+    modify_id, modify_time, cancel_id, cancel_time, cancel_flag, belong_id,storage_type,
+      keep_day,ord_price,out_ord_price,customer_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -45,12 +50,14 @@
       transfer_price, weight_price, add_id,
       add_time, modify_id, modify_time, 
       cancel_id, cancel_time, cancel_flag, 
-      belong_id,storage_type)
+      belong_id,storage_type,
+    keep_day,ord_price,out_ord_price,customer_id)
     values (#{id,jdbcType=VARCHAR}, #{material.id,jdbcType=VARCHAR}, #{storagePrice,jdbcType=DOUBLE},
       #{transferPrice,jdbcType=DOUBLE}, #{weightPrice,jdbcType=DOUBLE}, #{addUser.id,jdbcType=VARCHAR},
       #{addTime,jdbcType=TIMESTAMP}, #{modifyUser.id,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
       #{cancelId,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, 
-      #{belongId,jdbcType=VARCHAR},#{storageType,jdbcType=VARCHAR})
+      #{belongId,jdbcType=VARCHAR},#{storageType,jdbcType=VARCHAR}, #{keepDay,jdbcType=DOUBLE},
+      #{ordPrice,jdbcType=DOUBLE},#{outOrdPrice,jdbcType=DOUBLE},#{customer.id,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.maint.Price" >
     insert into t_maint_price
@@ -193,7 +200,11 @@ transfer_price,
       cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
       belong_id =  #{belongId,jdbcType=VARCHAR},
-     storage_type = #{storageType,jdbcType=VARCHAR}
+     storage_type = #{storageType,jdbcType=VARCHAR},
+        keep_day = #{keepDay,jdbcType=DOUBLE},
+      ord_price = #{ordPrice,jdbcType=DOUBLE},
+      out_ord_price = #{outOrdPrice,jdbcType=DOUBLE},
+      customer_id = #{customer.id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -207,11 +218,10 @@ transfer_price,
 
 
   <select id="select" resultMap="BaseResultMap" >
-    select  t.*   from t_maint_price t ,t_maint_material d
-    where t.material_id = d.id
+    select  t.*   from t_maint_price t ,t_maint_customer d
+    where t.customer_id = d.id
     and d.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
-      and d.standard like concat('%',#{param2,jdbcType=VARCHAR},'%')
-     and t.belong_id=#{param3,jdbcType=VARCHAR}
+     and t.belong_id=#{param2,jdbcType=VARCHAR}
       and t.cancel_flag = '0'
   </select>
 
@@ -223,4 +233,12 @@ transfer_price,
      and belong_id = #{param3,jdbcType=VARCHAR}
      and cancel_flag = '0'
   </select>
+
+  <select id="selectListByCustomer" resultMap="BaseResultMap" >
+    select  t.*   from t_maint_price t
+    where 1=1
+      and t.customer_id = #{param1,jdbcType=VARCHAR}
+      and t.belong_id = #{param2,jdbcType=VARCHAR}
+      and t.cancel_flag = '0'
+  </select>
 </mapper>