Merge remote-tracking branch 'origin/developerB' into developerB

.gitignore

@@ -1,3 +1,4 @@
+/target/
 /target/**/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
@@ -17,4 +18,3 @@ libraries
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -279,6 +279,7 @@ public class SpController extends BaseController {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        cmUser.setUserOrganizeID(0);
         cmUser.setMobile(mobile);
         cmUser.setUserIdentity(UserIdentity.MAKER.getCode());
         cmUser.setRegisterTime(DateUtils.getDateTime());

src/main/java/com/caimei/modules/weisha/web/CmOrganizeClubController.java

@@ -14,6 +14,7 @@ import com.caimei.modules.weisha.entity.CmMallOrganize;
 import com.caimei.modules.weisha.service.CmMallOrganizeService;
 import com.caimei.utils.AppKeys;
 import com.caimei.utils.RandomCodeGenerator;
+import com.caimei.utils.StringUtil;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.web.BaseController;
@@ -124,60 +125,62 @@ public class CmOrganizeClubController extends BaseController {
         //添加用户信息（新增或修改通用）
         cmUser.setName(newCmClub.getName());
         cmUser.setUserName(newCmClub.getLinkMan());
-        //添加用户新增信息
-        if (null == userID) {//新增
-            cmUser.setClubStatus("90");
-            cmUser.setRegisterUserTypeID("4");//设置为会所
-            cmUser.setUserIdentity(4);
-            cmUser.setServiceProviderStatus("90");//设置默认协销状态
-            cmUser.setServiceProviderID("1342");
-            cmUser.setAuditTime(currentDate);
-            cmUser.setAuditStatus("1");//审核通过
-            cmUser.setAuditNote("后台添加用户系统默认审核通过");
-            cmUser.setRegisterTime(currentDate);
-            cmUser.setLoginTime(currentDate);
-            cmUser.setAccount(newCmClub.getContractMobile() + RandomCodeGenerator.generateAccount(2));
-            cmUser.setPassword("weisha");
-            cmUser.setBindMobile(newCmClub.getContractMobile());
-            cmUser.setUserName(newCmClub.getName());
-            cmUser.setUserMoney(0d);
-            cmUser.setAbleUserMoney(0d);
-            cmUser.setValidFlag("1");
-            cmUser.setAgreeFlag("1");
-            cmUser.setUserLevelID("1");
-            cmUser.setUserPermission(5);
-            cmUserService.insert(cmUser);//插入新的用户数据
+        if (StringUtil.isNotBlank(newCmClub.getName())) {
+            //添加用户新增信息
+            if (null == userID) {//新增
+                cmUser.setClubStatus("90");
+                cmUser.setRegisterUserTypeID("4");//设置为会所
+                cmUser.setUserIdentity(4);
+                cmUser.setServiceProviderStatus("90");//设置默认协销状态
+                cmUser.setServiceProviderID("1342");
+                cmUser.setAuditTime(currentDate);
+                cmUser.setAuditStatus("1");//审核通过
+                cmUser.setAuditNote("后台添加用户系统默认审核通过");
+                cmUser.setRegisterTime(currentDate);
+                cmUser.setLoginTime(currentDate);
+                cmUser.setAccount(newCmClub.getContractMobile() + RandomCodeGenerator.generateAccount(2));
+                cmUser.setPassword("weisha");
+                cmUser.setBindMobile(newCmClub.getContractMobile());
+                cmUser.setUserName(newCmClub.getName());
+                cmUser.setUserMoney(0d);
+                cmUser.setAbleUserMoney(0d);
+                cmUser.setValidFlag("1");
+                cmUser.setAgreeFlag("1");
+                cmUser.setUserLevelID("1");
+                cmUser.setUserPermission(5);
+                cmUserService.insert(cmUser);//插入新的用户数据
+            }
+            //添加会所表信息
+            newCmClub.setSname(newCmClub.getName());
+            if (null == clubID) {
+                newCmClub.setStatus(90);
+                newCmClub.setUserID(cmUser.getUserID());
+                newCmClub.setDefaultServiceProviderID(AppKeys.DEFAULT_SPID);
+                newCmClub.setSpID(AppKeys.DEFAULT_SPID);
+                newCmClub.setMainServiceProviderID(AppKeys.DEFAULT_SPID);
+                newCmClub.setAddTime(currentDate);
+                newCmClub.setLinkMan1(newCmClub.getLinkMan());
+                newCmClub.setContractMobile1(newCmClub.getContractMobile());
+                newCmClub.setLevel(0d);
+                newCmClub.setSubClubCount(0);
+                newCmClub.setFavoriteTimes(0);
+                newCmClub.setClubTypeID(1);
+                newCmClub.setDefaultServiceProviderUpdTime(currentDate);
+                newCmClubService.insert(newCmClub);
+
+                //更新用户绑定关系
+                cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
+                String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
+                cmUser.setNick(nick);
+                cmUser.setCompanyUserID(cmUser.getUserID());
+
+                //更新会所绑定关系
+                newCmClub.setUserID(cmUser.getUserID());
+            }
+            cmUserService.update(cmUser);//更新用户表数据(编辑数据，或新增数据更新)
+
+            newCmClubService.update(newCmClub);//更新会所表数据(编辑数据，或新增数据更新)
         }
-        //添加会所表信息
-        newCmClub.setSname(newCmClub.getName());
-        if (null == clubID) {
-            newCmClub.setStatus(90);
-            newCmClub.setUserID(cmUser.getUserID());
-            newCmClub.setDefaultServiceProviderID(AppKeys.DEFAULT_SPID);
-            newCmClub.setSpID(AppKeys.DEFAULT_SPID);
-            newCmClub.setMainServiceProviderID(AppKeys.DEFAULT_SPID);
-            newCmClub.setAddTime(currentDate);
-            newCmClub.setLinkMan1(newCmClub.getLinkMan());
-            newCmClub.setContractMobile1(newCmClub.getContractMobile());
-            newCmClub.setLevel(0d);
-            newCmClub.setSubClubCount(0);
-            newCmClub.setFavoriteTimes(0);
-            newCmClub.setClubTypeID(1);
-            newCmClub.setDefaultServiceProviderUpdTime(currentDate);
-            newCmClubService.insert(newCmClub);
-
-            //更新用户绑定关系
-            cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
-            String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
-            cmUser.setNick(nick);
-            cmUser.setCompanyUserID(cmUser.getUserID());
-
-            //更新会所绑定关系
-            newCmClub.setUserID(cmUser.getUserID());
-        }
-        cmUserService.update(cmUser);//更新用户表数据(编辑数据，或新增数据更新)
-
-        newCmClubService.update(newCmClub);//更新会所表数据(编辑数据，或新增数据更新)
         return "redirect:" + Global.getAdminPath() + "/weisha/user/organizeClubList?userOrganizeID=" + cmUserOrganize.getId();
     }
 

src/main/resources/mappings/modules/miniprogram/CmMiniProgramUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.miniprogram.dao.CmMiniProgramUserDao">
-    
+
 	<sql id="cmMiniProgramUserColumns">
 		a.userID AS "userID",
 		a.account AS "account",
@@ -79,20 +79,20 @@
 		a.miniProgramOpenId AS "miniProgramOpenId",
 		a.miniProgramId AS "miniProgramId"
 	</sql>
-	
+
 	<sql id="cmMiniProgramUserJoins">
 	</sql>
-    
+
 	<select id="get" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		FROM user a
 		<include refid="cmMiniProgramUserJoins"/>
 		WHERE a.userID = #{userID}
 	</select>
-	
+
 	<select id="findList" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		,cb.nickName AS 'weixinNick'
 		FROM user a
@@ -112,15 +112,15 @@
 		</where>
 		ORDER BY a.registerTime desc
 	</select>
-	
+
 	<select id="findAllList" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		FROM user a
 		<include refid="cmMiniProgramUserJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -129,7 +129,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="CmMiniProgramUser"  keyProperty="userID" useGeneratedKeys="true">
 		INSERT INTO user(
 			account,
@@ -200,7 +200,6 @@
 			privateShopFlag,
 			privateClubFlag,
 			isMeiDaoAuthorized,
-			guideFlag,
 			loginFailTime,
 			tipStatus,
 			applyTime,
@@ -275,7 +274,6 @@
 			#{privateShopFlag},
 			#{privateClubFlag},
 			#{isMeiDaoAuthorized},
-			#{guideFlag},
 			#{loginFailTime},
 			#{tipStatus},
 			#{applyTime},
@@ -283,9 +281,9 @@
 			#{miniProgramId}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE user SET 	
+		UPDATE user SET
 			account = #{account},
 			mobile = #{mobile},
 			email = #{email},
@@ -362,10 +360,10 @@
 			miniProgramId = #{miniProgramId}
 		WHERE userID = #{userID}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM user
 		WHERE id = #{id}
 	</delete>
-	
-</mapper>
+
+</mapper>

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -223,6 +223,7 @@
 
     <insert id="insert" parameterType="CmUser" keyProperty="userID" useGeneratedKeys="true">
 		INSERT INTO user(
+			userOrganizeID,
 			account,
 		  	realName,
 		  	userIdentity,
@@ -293,9 +294,9 @@
 			userBeans,
 			privateShopFlag,
 			privateClubFlag,
-			isMeiDaoAuthorized,
-			guideFlag
+			isMeiDaoAuthorized
 		) VALUES (
+			#{userOrganizeID},
 			#{account},
 		  	#{realName},
 		  	#{userIdentity},
@@ -366,8 +367,7 @@
 			#{userBeans},
 			#{privateShopFlag},
 			#{privateClubFlag},
-			#{isMeiDaoAuthorized},
-			#{guideFlag}
+			#{isMeiDaoAuthorized}
 		)
 	</insert>