其他设置

src/main/java/com/caimei/modules/club/controller/CmUserOrganizeController.java

@@ -223,4 +223,35 @@ public class CmUserOrganizeController {
         newCmClubService.update(newCmClub);//更新会所表数据
         return JsonModel.newInstance().success();
     }
+
+    /**
+     * 省
+     */
+    @ResponseBody
+    @RequestMapping("/province")
+    public List<Province> getProvince() {
+        List<Province> provinceList = cmUserOrganizeService.getProvince();
+        return provinceList;
+    }
+
+    /**
+     * 市
+     */
+    @ResponseBody
+    @RequestMapping("/city")
+    public List<City> getCity(Long provinceid) {
+        List<City> cityList = cmUserOrganizeService.getCity(provinceid);
+        return cityList;
+    }
+
+    /**
+     * 区
+     */
+    @ResponseBody
+    @RequestMapping("/town")
+    public List<Town> getTown(Integer cityid) {
+        List<Town> townList = cmUserOrganizeService.getTown(cityid);
+        return townList;
+    }
+
 }

src/main/java/com/caimei/modules/club/dao/CmUserOrganizeDao.java

@@ -16,4 +16,10 @@ public interface CmUserOrganizeDao {
     City loadCityById(Integer cityID);
 
     Town loadTownByID(Integer townID);
+
+    List<Province> findAllProvince();
+
+    List<City> findAllCity(Long provinceid);
+
+    List<Town> findAllTown(Integer cityid);
 }

src/main/java/com/caimei/modules/club/service/CmUserOrganizeService.java

@@ -12,4 +12,10 @@ public interface CmUserOrganizeService {
     City loadCityById(Integer cityID);
 
     Town loadTownByID(Integer townID);
+
+    List<Province> getProvince();
+
+    List<City> getCity(Long provinceid);
+
+    List<Town> getTown(Integer cityid);
 }

src/main/java/com/caimei/modules/club/service/impl/CmUserOrganizeServiceImpl.java

@@ -36,4 +36,19 @@ public class CmUserOrganizeServiceImpl implements CmUserOrganizeService {
     public Town loadTownByID(Integer townID) {
         return cmUserOrganizeDao.loadTownByID(townID);
     }
+
+    @Override
+    public List<Province> getProvince() {
+        return cmUserOrganizeDao.findAllProvince();
+    }
+
+    @Override
+    public List<City> getCity(Long provinceid) {
+        return cmUserOrganizeDao.findAllCity(provinceid);
+    }
+
+    @Override
+    public List<Town> getTown(Integer cityid) {
+        return cmUserOrganizeDao.findAllTown(cityid);
+    }
 }

src/main/java/com/caimei/modules/shiro/controller/ShiroController.java

@@ -2,6 +2,7 @@ package com.caimei.modules.shiro.controller;
 
 
 import com.caimei.modules.shiro.entity.CmMallAdminUser;
+import com.caimei.modules.shiro.entity.CmMallOrganize;
 import com.caimei.modules.shiro.service.ShiroService;
 import com.caimei.utils.JsonModel;
 import com.caimei.utils.MD5Util;
@@ -25,7 +26,7 @@ public class ShiroController {
      * 登录
      */
     @PostMapping("/login")
-    public JsonModel login(@RequestBody CmMallAdminUser adminUser) throws Exception {
+    public JsonModel login(@RequestBody CmMallAdminUser adminUser) {
         JsonModel jsonModel = JsonModel.newInstance();
         //用户信息
         CmMallAdminUser user = shiroService.findByUsername(adminUser.getAccount(), adminUser.getOrganizeID());
@@ -87,8 +88,17 @@ public class ShiroController {
      */
     @RequestMapping("organizeInfo")
     public JsonModel organizeInfo(Integer id) {
-        CmMallAdminUser mallAdminUser = shiroService.findOrganize(id);
-        return JsonModel.newInstance().success(mallAdminUser);
+        CmMallOrganize mallOrganize = shiroService.findOrganize(id);
+        return JsonModel.newInstance().success(mallOrganize);
+    }
+
+    /**
+     * 修改组织信息
+     */
+    @RequestMapping("update")
+    public JsonModel updateOrganizeInfo(CmMallOrganize mallOrganize) {
+        shiroService.updateOrganizeInfo(mallOrganize);
+        return JsonModel.newInstance().success();
     }
 }
 

src/main/java/com/caimei/modules/shiro/dao/UserDao.java

@@ -2,6 +2,7 @@ package com.caimei.modules.shiro.dao;
 
 
 import com.caimei.modules.shiro.entity.CmMallAdminUser;
+import com.caimei.modules.shiro.entity.CmMallOrganize;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,5 +14,7 @@ public interface UserDao {
 
     void changePassword(CmMallAdminUser user);
 
-    CmMallAdminUser findOrganize(Integer id);
+    CmMallOrganize findOrganize(Integer id);
+
+    void updateOrganizeInfo(CmMallOrganize mallOrganize);
 }

src/main/java/com/caimei/modules/shiro/service/ShiroService.java

@@ -2,6 +2,7 @@ package com.caimei.modules.shiro.service;
 
 
 import com.caimei.modules.shiro.entity.CmMallAdminUser;
+import com.caimei.modules.shiro.entity.CmMallOrganize;
 
 public interface ShiroService {
 
@@ -13,5 +14,7 @@ public interface ShiroService {
 
     void changePassword(CmMallAdminUser user);
 
-    CmMallAdminUser findOrganize(Integer id);
+    CmMallOrganize findOrganize(Integer id);
+
+    void updateOrganizeInfo(CmMallOrganize mallOrganize);
 }

src/main/java/com/caimei/modules/shiro/service/impl/ShiroServiceImpl.java

@@ -2,11 +2,14 @@ package com.caimei.modules.shiro.service.impl;
 
 import com.caimei.modules.shiro.dao.UserDao;
 import com.caimei.modules.shiro.entity.CmMallAdminUser;
+import com.caimei.modules.shiro.entity.CmMallOrganize;
 import com.caimei.modules.shiro.service.ShiroService;
 import com.caimei.utils.TokenEncryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 @Service
 public class ShiroServiceImpl implements ShiroService {
     @Autowired
@@ -43,7 +46,13 @@ public class ShiroServiceImpl implements ShiroService {
     }
 
     @Override
-    public CmMallAdminUser findOrganize(Integer id) {
+    public CmMallOrganize findOrganize(Integer id) {
         return userDao.findOrganize(id);
     }
+
+    @Override
+    public void updateOrganizeInfo(CmMallOrganize mallOrganize) {
+        mallOrganize.setUpdateTime(new Date().toString());
+        userDao.updateOrganizeInfo(mallOrganize);
+    }
 }

src/main/resources/mapper/CmUserOrganizeMapper.xml

@@ -63,4 +63,16 @@
 		FROM town
 		WHERE townID = #{townID}
 	</select>
+
+	<select id="findAllProvince" resultType="com.caimei.modules.club.entity.Province">
+        SELECT * FROM province WHERE validFlag = '1'
+    </select>
+
+	<select id="findAllCity" resultType="com.caimei.modules.club.entity.City">
+        SELECT * FROM city WHERE provinceID = #{provinceID} AND validFlag = '1'
+    </select>
+
+	<select id="findAllTown" resultType="com.caimei.modules.club.entity.Town">
+        SELECT * FROM town WHERE cityID = #{cityID} AND validFlag = '1'
+    </select>
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -35,7 +35,7 @@
           id = #{id}
     </update>
 
-    <select id="findOrganize" resultType="com.caimei.modules.shiro.entity.CmMallAdminUser">
+    <select id="findOrganize" resultType="com.caimei.modules.shiro.entity.CmMallOrganize">
         SELECT
           *
         FROM
@@ -44,4 +44,24 @@
           id = #{id}
           AND delFlag = '0'
     </select>
+
+    <update id="updateOrganizeInfo" parameterType="com.caimei.modules.shiro.entity.CmMallOrganize">
+        UPDATE
+          cm_mall_organize
+        SET
+        <if test="contactNumber != null and contactNumber != ''">
+            contactNumber = #{contactNumber},
+        </if>
+        <if test="introduction != null and introduction != ''">
+            introduction = #{introduction}
+        </if>
+        <if test="afterSale != null and afterSale != ''">
+            afterSale = #{afterSale}
+        </if>
+        <if test="shoppingNotes != null and shoppingNotes != ''">
+            shoppingNotes = #{shoppingNotes}
+        </if>
+        WHERE
+          id =  #{id}
+    </update>
 </mapper>