客户管理

sto-api/src/main/java/com/shinsoft/stoapi/service/StoService.java

@@ -38,4 +38,8 @@ public interface StoService {
 
     @RequestMapping(value = "sto/Onhand/queryDelvOut", method = RequestMethod.GET)
     ResultJSON queryDelvOut(@RequestParam(value = "params" , required = false) String params);
+
+
+    @RequestMapping(value = "/sto/Customer/query", method = RequestMethod.GET)
+    ResultJSON ConfigQuery(@RequestParam(value = "params" , required = false) String params);
 }

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

@@ -3,6 +3,8 @@ 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.service.main.CustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,20 +17,71 @@ import java.util.Map;
 @RequestMapping("/Customer")
 public class CustomerController {
 
+    @Autowired
+    private CustomerService customerService;
+
     ResultJSON resultJSON;
 
     @RequestMapping(value = "/query")
     public ResultJSON query(int page, int rows,
-                            String Json,
-                            String params, HttpServletRequest request) {
+                            String params,
+                            HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            Map<String, Object> map = new HashMap<>();
+            resultJSON = customerService.query(page, rows, params, map);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/queryByPK")
+    public ResultJSON queryByPK(String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = customerService.queryByPK(id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/save")
+    public ResultJSON save(String json, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = customerService.save(userId, json);
+        } catch (Exception ex) {
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            ex.printStackTrace();
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/remove")
+    public ResultJSON remove(String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = customerService.remove(userId, id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/removeBatch")
+    public ResultJSON removeBatch(String ids, HttpServletRequest request) {
         try {
             String userId = (String) request.getHeader("userId");
-            Map<String,Object> map = new HashMap<>();
-//            map.put("storeNm" ,storeNm );
-//            map.put("areaCd" ,areaCd );
-//            map.put("stackCd" ,stackCd );
-//            map.put("storeType" ,storeType );
-//            resultJSON = configService.query(page, rows, params , map);
+            resultJSON = customerService.removeBatch(userId, ids);
         } catch (Exception ex) {
             ex.printStackTrace();
             resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);

sto/src/main/java/com/shinsoft/sto/model/main/Customer.java

@@ -1,5 +1,6 @@
 package com.shinsoft.sto.model.main;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,40 +15,32 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "仓库客户", description = "仓库客户基本信息表")
 public class Customer {
 
+    @TableId("ID")
+    @ApiModelProperty("主键ID")
+    private String id;
+
     @ApiModelProperty("客户名称")
     private String customerNm;
-
     @ApiModelProperty("客户简称")
     private String customerShortNm;
-
     @ApiModelProperty("联系人")
     private String contactPerson;
-
     @ApiModelProperty("联系方式")
     private String contactInfo;
-
     @ApiModelProperty("默认地址")
     private String defaultAddress;
-
-    private String attr1;
-
-    private String attr2;
-
-    private String attr3;
-
-    private String attr4;
-
-    private String attr5;
-
-    private String attr6;
-
-    private String attr7;
-
-    private String attr8;
-
-    private String attr9;
-
-    private String attr10;
+    @ApiModelProperty("新增人id")
+    private String addId;
+    @ApiModelProperty("新增时间")
+    private String addTime;
+    @ApiModelProperty("编辑人id")
+    private String modifyId;
+    @ApiModelProperty("修改时间")
+    private String modifyTime;
+    @ApiModelProperty("作废标识0作废1正常")
+    private String cancelFlag;
+    @ApiModelProperty("添加部门id")
+    private String addDeptId;
 
 
 }

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

@@ -1,5 +1,28 @@
 package com.shinsoft.sto.service.main;
 
-public interface CustomerService {
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.shinsoft.sto.model.main.Customer;
+import com.shinsoft.tools.model.common.ResultJSON;
 
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库客户 服务类
+ * </p>
+ *
+ * @author system
+ * @since 2024-10-15
+ */
+public interface CustomerService extends IService<Customer> {
+
+    ResultJSON query(int page, int rows, String params, Map<String, Object> map);
+
+    ResultJSON queryByPK(String id);
+
+    ResultJSON save(String userId, String json);
+
+    ResultJSON remove(String userId, String id);
+
+    ResultJSON removeBatch(String userId, String ids);
 }

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

@@ -1,10 +1,120 @@
 package com.shinsoft.sto.service.main.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.shinsoft.sto.mapper.main.CustomerMapper;
 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.ResultJSON;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库客户 服务实现类
+ * </p>
+ *
+ * @author system
+ * @since 2024-10-15
+ */
+@Service
 public class CustomerServiceImp extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
 
+    ResultJSON resultJSON;
+
+    @Autowired
+    CustomerMapper customerMapper;
+
+    @Override
+    public ResultJSON query(int page, int rows, String params, Map<String, Object> map) {
+        Page<Customer> customerPage = new Page<>(page, rows);
+        QueryWrapper<Customer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("cancel_flag", "0");
+        queryWrapper.orderByDesc("add_time");
+        
+        // 解析查询参数
+        if (!ObjectUtils.isEmpty(params)) {
+            JSONObject jsonObject = JSON.parseObject(params);
+            if (!ObjectUtils.isEmpty(jsonObject.get("customerNm"))) {
+                queryWrapper.like("customer_nm", jsonObject.getString("customerNm"));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("customerShortNm"))) {
+                queryWrapper.like("customer_short_nm", jsonObject.getString("customerShortNm"));
+            }
+            if (!ObjectUtils.isEmpty(jsonObject.get("contactPerson"))) {
+                queryWrapper.like("contact_person", jsonObject.getString("contactPerson"));
+            }
+        }
+        
+        Page<Customer> list = customerMapper.selectPage(customerPage, queryWrapper);
+        resultJSON = JSONTools.toResultJSON(list);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON queryByPK(String id) {
+        Customer customer = customerMapper.selectById(id);
+        resultJSON = JSONTools.toResultJSON(customer);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON save(String userId, String json) {
+        Date date = new Date();
+        Customer customer = JSON.parseObject(json, new TypeReference<Customer>() {
+        });
+        if (StringUtils.isEmpty(customer.getId())) {
+            customer.setCancelFlag("0");
+            customer.setAddId(userId);
+            customer.setAddTime(date.toString());
+            customerMapper.insert(customer);
+        } else {
+            customer.setModifyId(userId);
+            customer.setModifyTime(date.toString());
+            customerMapper.updateById(customer);
+        }
+
+        resultJSON = JSONTools.toResultJSON(customer);
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON remove(String userId, String id) {
+        Date date = new Date();
+        Customer customer = customerMapper.selectById(id);
+        customer.setCancelFlag("1");
+        customer.setModifyId(userId);
+        customer.setModifyTime(date.toString());
+        customerMapper.updateById(customer);
+        resultJSON = JSONTools.toResultJSON("");
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON removeBatch(String userId, String ids) {
+        Date date = new Date();
+        List<String> list = JSON.parseObject(ids, new TypeReference<List<String>>() {
+        });
+        Customer customer;
+        for (String id : list) {
+            customer = customerMapper.selectById(id);
+            customer.setCancelFlag("1");
+            customer.setModifyId(userId);
+            customer.setModifyTime(date.toString());
+            customerMapper.updateById(customer);
+        }
+        resultJSON = JSONTools.toResultJSON("");
+        return resultJSON;
+    }
 }