diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index 4369ad36b..fd3e129c9 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -116,40 +116,103 @@ public class EmisCustomerUserController extends BaseController
     }
 
     /**
-     * 新增快递客户用户
+     * 新增现金客户
      */
     @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:add')")
-    @Log(title = "快递客户用户", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser)
+    @Log(title = "新增现金客户", businessType = BusinessType.INSERT)
+    @PostMapping("/addMoneyUser")
+    public AjaxResult addMoneyUser(@RequestBody EmisCustomerUser emisCustomerUser)
     {
         try {
             EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
             if(oldUser!=null){
                 return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
             }
+             emisCustomerUser.setCustomerType("1");
+             emisCustomerUser.setSettledType("1");
+             emisCustomerUser.setUserType("1");
             return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
         } catch (DuplicateKeyException e) {
             e.printStackTrace();
             return AjaxResult.error("数据重复!");
         }
 
+    }
+
+    /**
+     * 修改月结客户
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:edit')")
+    @Log(title = "修改现金客户", businessType = BusinessType.UPDATE)
+    @PutMapping("/editMoneyUser")
+    public AjaxResult editMoneyUser(@RequestBody EmisCustomerUser emisCustomerUser)
+    {
+        try {
+
+            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+            if(oldUser!=null && !oldUser.getCustomerCode().equals(emisCustomerUser.getCustomerCode())){
+                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
+            }
+
+            emisCustomerUser.setCustomerType("1");
+            emisCustomerUser.setSettledType("1");
+            emisCustomerUser.setUserType("1");
+
+            return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
+        } catch (DuplicateKeyException e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据重复!");
+        }
+    }
+
+
+    /**
+     * 新增月结用户
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:add')")
+    @Log(title = "新增月结用户", businessType = BusinessType.INSERT)
+    @PostMapping("/addMonthUser")
+    public AjaxResult addMonthUser(@RequestBody EmisCustomerUser emisCustomerUser)
+    {
+        try {
+            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+            if(oldUser!=null){
+                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
+            }
+
+            oldUser=emisBaseService.getCustomerUserByMonthlyPayCode(emisCustomerUser.getMonthlyPayCode());
+            if(oldUser!=null){
+                return AjaxResult.error("月结卡号已存在");
+            }
+
+
+            return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
+        } catch (DuplicateKeyException e) {
+            e.printStackTrace();
+            return AjaxResult.error("数据重复!");
+        }
 
     }
 
     /**
-     * 修改快递客户用户
+     * 修改月结客户
      */
     @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:edit')")
-    @Log(title = "快递客户用户", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisCustomerUser emisCustomerUser)
+    @Log(title = "修改月结客户", businessType = BusinessType.UPDATE)
+    @PutMapping("/editMonthUser")
+    public AjaxResult editMonthUser(@RequestBody EmisCustomerUser emisCustomerUser)
     {
         try {
-//            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
-//            if(oldUser!=null){
-//                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
-//            }
+            EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
+            if(oldUser!=null && !oldUser.getCustomerCode().equals(emisCustomerUser.getCustomerCode())){
+                return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
+            }
+
+            oldUser=emisBaseService.getCustomerUserByMonthlyPayCode(emisCustomerUser.getMonthlyPayCode());
+            if(oldUser!=null && !oldUser.getCustomerCode().equals(emisCustomerUser.getCustomerCode())){
+                return AjaxResult.error("月结卡号已存在");
+            }
+
             return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
         } catch (DuplicateKeyException e) {
             e.printStackTrace();