【数据库整理】页面数据整理

src/main/java/com/caimei/modules/user/entity/ClubChangeSp.java

@@ -32,7 +32,7 @@ public class ClubChangeSp  extends DataEntity<ClubChangeSp> {
     private Date addTime;// 添加时间
     private Date auditTime;//审核时间
     // 创客表中
-    private String linkMan1;  // 申请创客姓名(创客联系名字)
+    private String linkMan;  // 申请创客姓名(创客联系名字)
     private String spName;    // 定点创客姓名(创客名字)
 
     // 用户表
@@ -119,12 +119,12 @@ public class ClubChangeSp  extends DataEntity<ClubChangeSp> {
         this.contractMobile = contractMobile;
     }
 
-    public String getLinkMan1() {
-        return linkMan1;
+    public String getLinkMan() {
+        return linkMan;
     }
 
-    public void setLinkMan1(String linkMan1) {
-        this.linkMan1 = linkMan1;
+    public void setLinkMan(String linkMan) {
+        this.linkMan = linkMan;
     }
 
     public String getSpName() {

src/main/java/com/caimei/modules/user/entity/ClubTemporary.java

@@ -43,6 +43,7 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
     private String city; // 市
     private String province; //省
     private String[] images;      //图片备注
+    private String remarks;
 
     public ClubTemporary() {
         super();
@@ -52,6 +53,16 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
         super(id);
     }
 
+    @Override
+    public String getRemarks() {
+        return remarks;
+    }
+
+    @Override
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     public Integer getUserId() {
         return userId;
     }

src/main/java/com/caimei/modules/user/web/CmSpController.java

@@ -1,10 +1,8 @@
 package com.caimei.modules.user.web;
 
-import com.caimei.constants.ClubStatus;
 import com.caimei.constants.ServiceProviderStatus;
 import com.caimei.constants.UserIdentity;
 import com.caimei.constants.UserType;
-import com.caimei.form.JsonForm;
 import com.caimei.modules.sys.utils.ValidateUtils;
 import com.caimei.modules.user.dao.CmSpDao;
 import com.caimei.modules.user.entity.CmMessage;
@@ -13,14 +11,16 @@ import com.caimei.modules.user.entity.NewCmSp;
 import com.caimei.modules.user.service.CmMessageService;
 import com.caimei.modules.user.service.CmSpService;
 import com.caimei.modules.user.service.CmUserService;
-import com.caimei.utils.*;
+import com.caimei.utils.AppKeys;
+import com.caimei.utils.DateUtils;
+import com.caimei.utils.MD5Util;
+import com.caimei.utils.MD5Utils;
 import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,7 +35,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -460,7 +463,7 @@ public class CmSpController extends BaseController {
 
 //    @RequestMapping(value = "createSp")
 //    @RequiresPermissions("user:cmSp:edit")
-//	public String createSp(String linkMan, String mobile, String password, String passWordConfirm, String duty) {
+//	public String createSp(String linkMan, String mobile, String password, String passWordConfirm, String duty1) {
 //        JsonForm jsonForm = null;
 //        if (!ValidateUtils.validateMobile(mobile)) {
 //            return "";
@@ -474,9 +477,9 @@ public class CmSpController extends BaseController {
 //            jsonForm.getReturn_message();
 //        }
 //        NewCmSp newCmSp = new NewCmSp();
-//        newCmSp.setLinkMan1(linkMan);
+//        newCmSp.setlinkMan(linkMan);
 //        newCmSp.setContractMobile(mobile);
-//        newCmSp.setDuty1(duty);
+//        newCmSp.setduty11(duty1);
 //        cmSpService.save(newCmSp);
 //        CmUser cmUser = new CmUser();
 //        cmUser.setMobile(mobile);

src/main/resources/mappings/modules/activity/FreeShippingMapper.xml

@@ -37,14 +37,14 @@
 		b.start_time AS "freeShippingtTpe.startTime",
 		b.end_time AS "freeShippingtTpe.endTime",
 		c.name AS "clubName",
-		c.contractMobile1 AS "clubMobile",
+		c.contractMobile AS "clubMobile",
 		u.userName AS "userName",
 		u.userLevelID AS "userLevelType",
 		s.shopOrderID AS "shopOrederNo",
 		s.status AS "shopOrderStatus",
 		sp.`name` AS "spName",
 		sp.serviceLevelID AS "spLevelId",
-		sp.contractMobile1 AS "spMobile"
+		sp.contractMobile AS "spMobile"
 
 	</sql>
 	
@@ -80,7 +80,7 @@
 				AND c.name LIKE concat('%',#{clubName},'%')
 			</if>
 			<if test="clubMobile != null and clubMobile != ''">
-				AND c.contractMobile1 LIKE concat('%',#{clubMobile},'%')
+				AND c.contractMobile LIKE concat('%',#{clubMobile},'%')
 			</if>
 			<if test="status != null and status != ''">
 				AND a.status = #{status}

src/main/resources/mappings/modules/bulkpurchase/ReceiptListMapper.xml

@@ -18,7 +18,7 @@
         (SELECT count(1) FROM bp_order  bo WHERE bo.id = bp.id  AND (bo.status != 0) AND (delFlag = 0) AND (bo.status is NOT NULL)) AS "reviewFailureNum",
 		c.name AS "clubName",
 		c.address AS "ClubAddress",
-		c.contractMobile1 AS "ClubMobile",
+		c.contractMobile AS "ClubMobile",
 		(SELECT COUNT(1) FROM bp_order_stages bos WHERE bos.orderId = bp.id ) AS "stagesNum",
 		(SELECT COUNT(1) FROM bp_order_stages bos WHERE bos.orderId = bp.id AND bos.payStatus = 0) AS "unStagesNum",
 		(SELECT count(1) FROM cm_finance_receipts WHERE orderId = bp.id AND (`status` = 2 OR `status` =4) AND delFlag = 0)AS "reviewStagesNum",

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -116,7 +116,7 @@
         co.splitFlag AS splitFlag,
         co.postageOrderFlag AS postageOrderFlag,
         (case when co.orderType = '0' then
-        (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan1 end from serviceprovider where serviceProviderID = co.spID)
+        (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end from serviceprovider where serviceProviderID = co.spID)
         else
         ''
         end) AS spName,
@@ -239,7 +239,6 @@
 		cs.itemCount AS itemCount,
 		cs.needPayAmount AS needPayAmount,
 		s.name AS shopName,
-		cs.status AS status,
 		cs.shopID AS shopID
 		FROM cm_shop_order cs
 		LEFT JOIN shop s ON cs.shopID = s.shopID

src/main/resources/mappings/modules/order/NewReceiptListMapper.xml

@@ -26,7 +26,7 @@
 		bou.town AS "town",
 		bou.address AS "address",
 		c.address AS "ClubAddress",
-		c.contractMobile1 AS "ClubMobile",
+		c.contractMobile AS "ClubMobile",
 		co.status AS "status",
 		co.productTotalFee AS "productTotalFee",
 		co.orderTotalFee AS "orderTotalFee",

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -108,7 +108,6 @@
         co.orderTime AS orderTime,
 		co.confirmTime AS confirmTime,
 		co.payTotalFee AS payTotalFee,
-		co.payWay AS payWay,
 		co.payStatus AS payStatus,
 		co.refundType AS refundType,
 		co.sendOutStatus AS sendOutStatus,
@@ -119,7 +118,7 @@
 		co.splitFlag AS splitFlag,
 		co.postageOrderFlag AS postageOrderFlag,
 		(case when co.orderType = '0' then
-			(select case status when 91 then '采美默认协销经理(官方账号)' else linkMan1 end from serviceprovider where serviceProviderID = co.spID)
+			(select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end from serviceprovider where serviceProviderID = co.spID)
 		else
 			''
 		end) AS spName,
@@ -285,7 +284,6 @@
 		cs.itemCount AS itemCount,
 		cs.needPayAmount AS needPayAmount,
 		s.name AS shopName,
-		cs.status AS status,
 		cs.shopID AS shopID
 		FROM cm_shop_order cs
 		LEFT JOIN shop s ON cs.shopID = s.shopID
@@ -310,8 +308,7 @@
 		u.name AS buyer,
 		co.orderSource AS orderSource,
 		co.orderTotalFee AS orderTotalFee,
-		co.orderTime AS orderTime,
-		cs.status AS status
+		co.orderTime AS orderTime
 		FROM cm_shop_order cs
 		LEFT JOIN cm_order co ON cs.orderNo = co.orderNo
 		LEFT JOIN shop s ON cs.shopID = s.shopID
@@ -347,13 +344,9 @@
 			note,
 			clubID,
 			clubScanTime,
-			payWay,
 			orderSource,
 			orderTime,
 			productCount,
-			cooFreeFlag,
-			cooFreeRate,
-			cooFreeAmount,
 			confirmFlag,
 			clauseID,
 			clauseContent,
@@ -399,13 +392,9 @@
 			#{note},
 			#{clubID},
 			#{clubScanTime},
-			#{payWay},
 			#{orderSource},
 			#{orderTime},
 			#{productCount},
-			#{cooFreeFlag},
-			#{cooFreeRate},
-			#{cooFreeAmount},
 			#{confirmFlag},
 			#{clauseID},
 			#{clauseContent},
@@ -613,9 +602,7 @@
 	</select>
 
 	<update id="confirmOrder">
-		UPDATE cm_order_product SET
-		confirmFlag = 1
-		WHERE orderID = #{orderID}
+
 	</update>
 
 	<update id="updateStatus" parameterType="NewOrder">
@@ -733,7 +720,7 @@
 		where promotionsId=#{promotionsId} and orderId=#{orderId}
 	</select>
 	<select id="findServiceProviderList" resultType="com.caimei.modules.user.entity.NewCmSp">
-		select s.serviceProviderID,s.linkMan1 from serviceprovider s join user u on s.userID = u.userID where s.status = 90 and s.serviceProviderID != 1342
+		select s.serviceProviderID,s.linkMan from serviceprovider s join user u on s.userID = u.userID where s.status = 90 and s.serviceProviderID != 1342
 	</select>
 	<insert id="insertPromotionsRecord" parameterType="com.caimei.modules.product.entity.CmPromotion" keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_promotions_order(
@@ -864,7 +851,7 @@
 		SELECT productID FROM cm_order_product WHERE orderID = #{orderID} LIMIT 1
 	</select>
 	<insert id="insertShortLink">
-    INSERT INTO `caimei`.`cm_short_link` (
+    INSERT INTO  cm_short_link (
       `markId`, `shortLink`, `jumpLink`,
       `createTime`
     )

src/main/resources/mappings/modules/postage/CmMallFreePostageCardDao.xml

@@ -126,7 +126,7 @@
   <sql id="selectVo">
     SELECT DISTINCT
       p.id, u.userID, u.userOrganizeID AS organizeID, p.freePostFlag, p.freePostFee, p.addTime, p.expiredTime, p.delFlag,
-      c.clubID, c.name AS clubName, c.address, c.linkMan1, c.contractMobile1, c.linkMan2, c.contractMobile2
+      c.clubID, c.name AS clubName, c.address, c.linkMan, c.contractMobile, c.linkMan2, c.contractMobile2
     FROM USER u LEFT JOIN club c ON u.userID = c.userID AND u.registerUserTypeID=3
                 LEFT JOIN cm_mall_free_postage_card p ON c.userID=p.userID
   </sql>
@@ -147,8 +147,8 @@
       <if test="clubID != null and clubID != ''">
         AND c.clubID = #{clubID}
       </if>
-      <if test="contractMobile1 != null and contractMobile1 != ''">
-        AND c.contractMobile1 = #{contractMobile1}
+      <if test="contractMobile != null and contractMobile != ''">
+        AND c.contractMobile = #{contractMobile}
       </if>
       <if test="freePostFlag != null and freePostFlag != ''">
         AND p.freePostFlag = #{freePostFlag}
@@ -165,8 +165,8 @@
       <if test="expiredTime != null and expiredTime != ''">
         AND p.addTime <![CDATA[  <=  ]]> #{expiredTime}
       </if>
-      <if test="linkMan1 != null and linkMan1 != ''">
-        AND c.linkMan1 like concat('%', #{linkMan1} ,'%')
+      <if test="linkMan != null and linkMan != ''">
+        AND c.linkMan like concat('%', #{linkMan} ,'%')
       </if>
     </where>
     ORDER BY p.addTime DESC

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

@@ -22,7 +22,7 @@
 		a.checkTime AS "checkTime",
 		b.address AS "address",
 		b.name AS "clubName",
-		c.linkMan1 AS "linkMan1",
+		c.linkMan AS "linkMan",
 		b.addTime AS "addTime",
 		b.auditTime AS "auditTime"
 	</sql>
@@ -55,11 +55,11 @@
                 <if test="dbName == 'mssql'">'%'+#{clubName}+'%'</if>
                 <if test="dbName == 'mysql'">concat('%',#{clubName},'%')</if>
             </if>
-            <if test="linkMan1 != null and linkMan1 != ''">
-                AND c.linkMan1 LIKE
-                <if test="dbName == 'oracle'">'%'||#{linkMan1}||'%'</if>
-                <if test="dbName == 'mssql'">'%'+#{linkMan1}+'%'</if>
-                <if test="dbName == 'mysql'">concat('%',#{linkMan1},'%')</if>
+            <if test="linkMan != null and linkMan != ''">
+                AND c.linkMan LIKE
+                <if test="dbName == 'oracle'">'%'||#{linkMan}||'%'</if>
+                <if test="dbName == 'mssql'">'%'+#{linkMan}+'%'</if>
+                <if test="dbName == 'mysql'">concat('%',#{linkMan},'%')</if>
             </if>
             <if test="checkStatus != null and checkStatus != ''">
                 AND a.checkStatus = #{checkStatus}

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

@@ -25,7 +25,7 @@
 		a.mainProduct AS "mainProduct",
 		a.isAgreed AS "isAgreed",
 		a.addTime AS "addTime",
-		IFNULL(s.name,s.linkMan1) AS "spName",
+		IFNULL(s.name,s.linkMan) AS "spName",
         if(csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime,1,0) as svipUserFlag
 	</sql>
 	

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

@@ -5,7 +5,6 @@
 	<sql id="cmClubinfoColumns">
 		a.clubInfoID AS "clubInfoID",
 		a.clubID AS "clubID",
-		a.gclubID AS "gclubID",
 		a.userID AS "userID",
 		a.area AS "area",
 		a.bedNums AS "bedNums",
@@ -61,9 +60,6 @@
 			<if test="clubID != null and clubID != ''">
 				AND a.clubID = #{clubID}
 			</if>
-			<if test="gclubID != null and gclubID != ''">
-				AND a.gclubID = #{gclubID}
-			</if>
 			<if test="userID != null and userID != ''">
 				AND a.userID = #{userID}
 			</if>
@@ -96,7 +92,6 @@
 
 	<insert id="insert" parameterType="CmClubinfo"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO clubinfo(
-			gclubID,
 			clubID,
 			userID,
 			area,
@@ -118,8 +113,8 @@
 			clinchPepole,
 			createTime,
 			updateTime
-		) VALUES (0,
-			#{clubID},
+		) VALUES (
+		    #{clubID},
 			#{userID},
 			#{area},
 			#{bedNums},

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

@@ -57,11 +57,8 @@
 			<if test="contractMobile != null and contractMobile != ''">
 				AND a.contractMobile = #{contractMobile}
 			</if>
-			<if test="contractMobile1 != null and contractMobile1 != ''">
-				AND a.contractMobile1 = #{contractMobile1}
-			</if>
-			<if test="linkMan1 != null and linkMan1 != ''">
-				AND a.linkMan1 LIKE concat('%',#{linkMan1},'%')
+			<if test="linkMan != null and linkMan != ''">
+				AND a.linkMan LIKE concat('%',#{linkMan},'%')
 			</if>
 			<if test="validFlag != null and validFlag != ''">
 				AND a.validFlag = #{validFlag}
@@ -175,11 +172,11 @@
 			<if test="status != null and status != ''">
 				AND a.status = #{status}
 			</if>
-			<if test="contractMobile1 != null and contractMobile1 != ''">
-				AND a.contractMobile1 = #{contractMobile1}
+			<if test="contractMobile != null and contractMobile != ''">
+				AND a.contractMobile = #{contractMobile}
 			</if>
-			<if test="linkMan1 != null and linkMan1 != ''">
-				AND a.linkMan1 LIKE concat('%',#{linkMan1},'%')
+			<if test="linkMan != null and linkMan != ''">
+				AND a.linkMan LIKE concat('%',#{linkMan},'%')
 			</if>
 		</where>
 		<choose>

src/main/webapp/WEB-INF/views/modules/user/cmSpEdit.jsp

@@ -36,7 +36,7 @@
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>联系人：</label>
 			<div class="controls">
-				<form:input path="linkMan1" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
+				<form:input path="linkMan" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
 			</div>
 		</div>
 		<div class="control-group">

src/main/webapp/WEB-INF/views/modules/user/cmSpList.jsp

@@ -32,7 +32,7 @@
 		<%--<label>协销ID：</label>
 			<form:input path="serviceProviderID" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
 		<label>协销姓名：</label>
-			<form:input path="linkMan1" htmlEscape="false" maxlength="20" class="input-medium"/>
+			<form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-medium"/>
 		<label>状态：</label>
 		<form:select path="status" class="input-medium">
 			<form:option value="" label="请选择"/>
@@ -41,7 +41,7 @@
 		<label>手机号：</label>
 			<form:input path="contractMobile" htmlEscape="false" maxlength="20" class="input-medium"/>
 		<%--<label>联系人：</label>
-			<form:input path="linkMan1" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
+			<form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
 		&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 		<div class="clearfix"></div>
 	</div>
@@ -65,7 +65,7 @@
 			<tr>
 				<td>${newCmSp.serviceProviderID}</td>
 				<%--<td>${newCmSp.name}</td>--%>
-				<td>${newCmSp.linkMan1}</td>
+				<td>${newCmSp.linkMan}</td>
 				<td>${newCmSp.contractMobile}</td>
 				<td>${newCmSp.spStatusName}</td>
 				<%--<td>${newCmSp.spIdentity}</td>--%>

src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp

@@ -189,11 +189,11 @@
 								  htmlEscape="false"/>
 				</form:select>
 				 <label>手机号：</label>
-					<form:input path="contractMobile1" htmlEscape="false" maxlength="100" class="input-medium"/>
+					<form:input path="contractMobile" htmlEscape="false" maxlength="100" class="input-medium"/>
             </div>
 			<div class="item">
 				 <label>联系人：</label>
-				<form:input path="linkMan1" htmlEscape="false" maxlength="100" class="input-medium"/>
+				<form:input path="linkMan" htmlEscape="false" maxlength="100" class="input-medium"/>
 				<label>邮箱：</label>
 				<form:input path="email" htmlEscape="false" maxlength="100" class="input-medium"/>
             </div>
@@ -243,10 +243,10 @@
 					${newCmShop.sname}
 				</td>
 				<td>
-					${newCmShop.linkMan1}
+					${newCmShop.linkMan}
 				</td>
 				<td>
-					${newCmShop.contractMobile1}
+					${newCmShop.contractMobile}
 				</td>
 				<td>
 					${newCmShop.email}

src/main/webapp/WEB-INF/views/modules/userNew/clubChangeSpList.jsp

@@ -81,7 +81,7 @@
 			 <label>机构名称：</label>
 				<form:input path="clubName" htmlEscape="false" maxlength="11" class="input-mini"/>
 			<label>协销姓名：</label>
-			<form:input path="linkMan1" htmlEscape="false" maxlength="20" class="input-small"/>
+			<form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-small"/>
 			 <label>状态：</label>
 			<form:select path="checkStatus" class="input-medium required">
 				<form:option value="" label="请选择"/>
@@ -110,7 +110,7 @@
 			<tr>
 				<td>${items.clubName}</td>
 				<td>${items.address}</td>
-				<td>${items.linkMan1}</td>
+				<td>${items.linkMan}</td>
 				<td>${fns:getDictLabel(items.checkStatus,"ClubChangeSp_checkStatus","" )}</td>
 				<td>
 					<%--机构表中大多数审核和添加时间只存在一个--%>

src/main/webapp/WEB-INF/views/modules/userNew/cmSpEdit.jsp

@@ -43,7 +43,7 @@
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>联系人：</label>
 			<div class="controls">
-				<form:input path="linkMan1" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
+				<form:input path="linkMan" htmlEscape="false" maxlength="11" class="input-xlarge required"/>
 			</div>
 		</div>
 		<div class="control-group">

src/main/webapp/WEB-INF/views/modules/userNew/cmSpList.jsp

@@ -40,7 +40,7 @@
 		<%--<label>协销ID：</label>
 			<form:input path="serviceProviderID" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
 		<label>协销姓名：</label>
-			<form:input path="linkMan1" htmlEscape="false" maxlength="20" class="input-medium"/>
+			<form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-medium"/>
 		<label>状态：</label>
 		<form:select path="status" class="input-medium">
 			<form:option value="" label="请选择"/>
@@ -48,8 +48,6 @@
 		</form:select>
 		<label>手机号：</label>
 			<form:input path="contractMobile" htmlEscape="false" maxlength="20" class="input-medium"/>
-		<%--<label>联系人：</label>
-			<form:input path="linkMan1" htmlEscape="false" maxlength="20" class="input-medium"/>--%>
 		&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 		<div class="clearfix"></div>
 	</div>
@@ -73,7 +71,7 @@
 			<tr>
 				<td>${newCmSp.serviceProviderID}</td>
 				<%--<td>${newCmSp.name}</td>--%>
-				<td>${newCmSp.linkMan1}</td>
+				<td>${newCmSp.linkMan}</td>
 				<td>${newCmSp.contractMobile}</td>
 				<td>
 					<c:if test="${newCmSp.status eq 90}">