确认注册,记录

src/main/java/com/caimei/modules/user/dao/ClubTemporaryDao.java

@@ -1,9 +1,12 @@
 package com.caimei.modules.user.dao;
 
+import com.caimei.modules.user.entity.ClubConfirmRecord;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.caimei.modules.user.entity.ClubTemporary;
 
+import java.util.List;
+
 /**
  * 未确认机构DAO接口
  * @author plf
@@ -11,5 +14,10 @@ import com.caimei.modules.user.entity.ClubTemporary;
  */
 @MyBatisDao
 public interface ClubTemporaryDao extends CrudDao<ClubTemporary> {
-	
+
+    void insertClubConfirmRecord(ClubConfirmRecord confirmRecord);
+
+    List<ClubConfirmRecord> findConfirmRecord(Integer userId);
+
+    ClubTemporary findByConfirmUserId(Integer userId);
 }

src/main/java/com/caimei/modules/user/dao/CmSpDao.java

@@ -21,4 +21,6 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
     int updateSpManager(@Param("spManagerID") Integer spManagerID);
 
     List<NewCmSp> findSelectList(NewCmSp newCmSp);
+
+    NewCmSp findByUserId(Integer userId);
 }

src/main/java/com/caimei/modules/user/dao/CmUserDao.java

@@ -75,4 +75,6 @@ public interface CmUserDao extends CrudDao<CmUser> {
     CmUser findUserByOrganizeId(Integer organizeId);
 
     String getOrganizeStoreName(Integer organizeStoreId);
+
+    void updateByClubStatus(@Param("clubStatus") int clubStatus,@Param("confirmUserId") Integer confirmUserId);
 }

src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -4,6 +4,7 @@ import com.caimei.modules.user.entity.NewCmClub;
 import com.caimei.modules.user.entity.UserBeansHistory;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +24,6 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
     Integer findSpId(Integer spID);
 
     void insertBeansHistory(UserBeansHistory beansHistory);
+
+    void updateByStatus(@Param("clubStatus") int clubStatus, @Param("confirmUserId") Integer confirmUserId);
 }

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

@@ -0,0 +1,85 @@
+package com.caimei.modules.user.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author : plf
+ * @date : 2021/7/14
+ */
+public class ClubConfirmRecord implements Serializable {
+    private Integer id;
+    private Integer userId;     //机构用户id
+    private Integer systemUserId;       //系统确认人id
+    private String images;      //图片备注,以","隔开
+    private String remarks;     //文字备注
+    private Date confirmTime;   //确认时间
+    private String systemName;      //系统名称
+    private String[] remarkImages;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getSystemUserId() {
+        return systemUserId;
+    }
+
+    public void setSystemUserId(Integer systemUserId) {
+        this.systemUserId = systemUserId;
+    }
+
+    public String getImages() {
+        return images;
+    }
+
+    public void setImages(String images) {
+        this.images = images;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Date getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(Date confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public String getSystemName() {
+        return systemName;
+    }
+
+    public void setSystemName(String systemName) {
+        this.systemName = systemName;
+    }
+
+    public String[] getRemarkImages() {
+        return remarkImages;
+    }
+
+    public void setRemarkImages(String[] remarkImages) {
+        this.remarkImages = remarkImages;
+    }
+}

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

@@ -15,15 +15,16 @@ import java.util.Date;
 public class ClubTemporary extends DataEntity<ClubTemporary> {
 
     private static final long serialVersionUID = 1L;
-    private String userId;        // 协销用户Id
+    private Integer userId;        // 协销用户Id
     private String name;        // 机构名称
+    private Integer confirmUserId;      //确认注册机构userId
     private String shortName;        // 机构简称
     private String bindMobile;        // 企业绑定手机号
     private String contractEmail;        // 联系邮箱
     private String linkMan;        // 联系人
-    private String provinceId;        // 省id
-    private String cityId;        // 市id
-    private String townId;        // 地址Id
+    private Integer provinceId;        // 省id
+    private Integer cityId;        // 市id
+    private Integer townId;        // 地址Id
     private String address;        // 地址
     private String shopPhoto;        // 门头照
     private String businessLicense;        // 营业执照
@@ -41,6 +42,7 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
     private String town; // 区
     private String city; // 市
     private String province; //省
+    private String[] images;      //图片备注
 
     public ClubTemporary() {
         super();
@@ -50,11 +52,11 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
         super(id);
     }
 
-    public String getUserId() {
+    public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
 
@@ -67,6 +69,14 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
         this.name = name;
     }
 
+    public Integer getConfirmUserId() {
+        return confirmUserId;
+    }
+
+    public void setConfirmUserId(Integer confirmUserId) {
+        this.confirmUserId = confirmUserId;
+    }
+
     @Length(min = 0, max = 20, message = "机构简称长度必须介于 0 和 20 之间")
     public String getShortName() {
         return shortName;
@@ -103,27 +113,27 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
         this.linkMan = linkMan;
     }
 
-    public String getProvinceId() {
+    public Integer getProvinceId() {
         return provinceId;
     }
 
-    public void setProvinceId(String provinceId) {
+    public void setProvinceId(Integer provinceId) {
         this.provinceId = provinceId;
     }
 
-    public String getCityId() {
+    public Integer getCityId() {
         return cityId;
     }
 
-    public void setCityId(String cityId) {
+    public void setCityId(Integer cityId) {
         this.cityId = cityId;
     }
 
-    public String getTownId() {
+    public Integer getTownId() {
         return townId;
     }
 
-    public void setTownId(String townId) {
+    public void setTownId(Integer townId) {
         this.townId = townId;
     }
 
@@ -270,4 +280,12 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
     public void setProvince(String province) {
         this.province = province;
     }
+
+    public String[] getImages() {
+        return images;
+    }
+
+    public void setImages(String[] images) {
+        this.images = images;
+    }
 }

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

@@ -21,6 +21,7 @@ public class CmUser extends DataEntity<CmUser> {
     private Integer userPermission;        // 用户权限
     private String email;        // 邮箱
     private String userName;        // 用户名
+    private Integer source;         //注册来源: 0网站 1小程序
     private String image;        // image
     private String password;        // 密码
     private String userLevelID;        // 用户会员等级，见表c_userlevel或枚举UserLevel
@@ -816,4 +817,12 @@ public class CmUser extends DataEntity<CmUser> {
     public void setOperatorMobile(String operatorMobile) {
         this.operatorMobile = operatorMobile;
     }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
 }

src/main/java/com/caimei/modules/user/service/ClubTemporaryService.java

@@ -1,44 +1,236 @@
 package com.caimei.modules.user.service;
 
-import java.util.List;
-
+import com.caimei.modules.miniprogram.utils.UploadPicUtils;
+import com.caimei.modules.user.dao.ClubTemporaryDao;
+import com.caimei.modules.user.dao.CmSpDao;
+import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.NewCmClubDao;
+import com.caimei.modules.user.entity.*;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.user.entity.ClubTemporary;
-import com.caimei.modules.user.dao.ClubTemporaryDao;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 未确认机构Service
+ *
  * @author plf
  * @version 2021-07-13
  */
 @Service
 @Transactional(readOnly = true)
 public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemporary> {
+    @Autowired
+    private ClubTemporaryDao clubTemporaryDao;
+    @Autowired
+    private CmUserDao cmUserDao;
+    @Autowired
+    private CmSpDao cmSpDao;
+    @Autowired
+    private NewCmClubDao newCmClubDao;
+
+    public ClubTemporary get(String id) {
+        return super.get(id);
+    }
+
+    public List<ClubTemporary> findList(ClubTemporary clubTemporary) {
+        return super.findList(clubTemporary);
+    }
+
+    public Page<ClubTemporary> findPage(Page<ClubTemporary> page, ClubTemporary clubTemporary) {
+        return super.findPage(page, clubTemporary);
+    }
+
+    @Transactional(readOnly = false)
+    public void save(ClubTemporary clubTemporary) {
+        super.save(clubTemporary);
+    }
+
+    @Transactional(readOnly = false)
+    public void delete(ClubTemporary clubTemporary) {
+        super.delete(clubTemporary);
+    }
+
+    @Transactional(readOnly = false)
+    public void registerSave(ClubTemporary clubTemporary) throws Exception {
+        Date date = new Date();
+        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
+        if (clubTemporary.getConfirmUserId() == null) {
+            List<CmUser> userList = cmUserDao.selectByMobileOrEmail(clubTemporary.getBindMobile(), "crm");
+            if (userList != null && userList.size() > 0) {
+                throw new Exception("机构手机号已存在");
+            }
+            NewCmSp cmSp = cmSpDao.findByUserId(clubTemporary.getUserId());
+            CmUser user = new CmUser();
+            // 机构拉上线统称为此IP方便后面直接标记为协销代注册
+            user.setRegisterIP("192.168.1.10");
+            // 注册来源: 0网站 1小程序（拉机构上线小程序注册）
+            user.setSource(1);
+            // 采美默认组织机构0
+            user.setUserOrganizeID(0);
+            // 组织名称
+            user.setName(clubTemporary.getLinkMan());
+            // 用户名
+            user.setUserName(clubTemporary.getLinkMan());
+            // 绑定手机号
+            user.setBindMobile(clubTemporary.getBindMobile());
+            // 设置已确认(客服确认机构)
+            user.setClubStatus("93");
+            // 默认密码
+            user.setPassword("12345678");
+            // 同意协议
+            user.setAgreeFlag(clubTemporary.getIsAgreed());
+            // 用户状态，1正常，0冻结
+            user.setValidFlag("1");
+            // 协销Id
+            user.setServiceProviderID(cmSp.getServiceProviderID().toString());
+            // 协销状态
+            user.setServiceProviderStatus(cmSp.getStatus().toString());
+            // 会员机构，填写升级资料
+            if (StringUtils.isNotBlank(clubTemporary.getBusinessLicense())) {
+                // 用户类型，供应商1，会员机构3,普通机构4
+                user.setRegisterUserTypeID("3");
+                // 用户身份: 1协销 2会员机构 3供应商 4普通机构
+                user.setUserIdentity(2);
+                // 用户权限: 2会员机构 3供应商 4协销 5普通机构
+                user.setUserPermission(2);
+                // 组织名称
+                user.setName(clubTemporary.getName());
+                // 邮箱
+                user.setEmail(clubTemporary.getContractEmail());
+                // 是否已经引导过(机构升级:0否，1是)
+                user.setGuideFlag("1");
+                //后台客服确认注册默认审核通过
+                user.setAuditTime(time);
+                user.setAuditStatus("1");
+                user.setAuditNote("后台客服确认注册默认审核通过");
+            } else {
+                // 用户类型，供应商1，会员机构3,普通机构4
+                user.setRegisterUserTypeID("4");
+                // 用户身份: 1协销 2会员机构 3供应商 4普通机构
+                user.setUserIdentity(4);
+                // 用户权限: 2会员机构 3供应商 4协销 5普通机构
+                user.setUserPermission(5);
+                // 是否已经引导过(机构升级:0否，1是)
+                user.setGuideFlag("0");
+            }
+            cmUserDao.insert(user);
+
+            NewCmClub club = new NewCmClub();
+            // 联系手机
+            club.setContractMobile(clubTemporary.getBindMobile());
+            // 联系人
+            club.setLinkMan(clubTemporary.getLinkMan());
+            // 用户Id
+            club.setUserID(user.getUserID());
+            // 设置协销ID
+            club.setSpID(cmSp.getServiceProviderID());
+            // 待扫描
+            club.setScanFlag("0");
+            // 设置已确认(客服确认机构)
+            club.setStatus(93);
+            // 会员机构，填写升级资料
+            if (StringUtils.isNotBlank(clubTemporary.getBusinessLicense())) {
+                // 机构名称
+                club.setName(clubTemporary.getName());
+                // 机构简称
+                club.setSname(clubTemporary.getShortName());
+                // 邮箱
+                club.setContractEmail1(clubTemporary.getContractEmail());
+                // 地址
+                club.setProvinceID(clubTemporary.getProvinceId());
+                club.setCityID(clubTemporary.getCityId());
+                club.setTownID(clubTemporary.getTownId());
+                club.setAddress(clubTemporary.getAddress());
+                // 门头照
+                club.setHeadpic(clubTemporary.getShopPhoto());
+                // 营业执照
+                club.setBusinessLicenseImage(clubTemporary.getBusinessLicense());
+                // 统一社会信用代码
+                club.setSocialCreditCode(clubTemporary.getSocialCreditCode());
+                // 分类: 1医美, 2生美
+                club.setFirstClubType(clubTemporary.getFirstClubType());
+                if ("1".equals(clubTemporary.getFirstClubType())) {
+                    // 医美二级分类: 1诊所、2门诊、3医院
+                    club.setSecondClubType(clubTemporary.getSecondClubType());
+                    // 门诊和医院则需要填写科室
+                    club.setDepartment(clubTemporary.getDepartment());
+                    // 医美分类必须上传医疗执业许可证
+                    club.setMedicalPracticeLicenseImg(clubTemporary.getMedicalPracticeLicense());
+                }
+                // 主打项目(mainpro)
+                club.setMainpro(clubTemporary.getMainProduct());
+                //后台客服确认注册默认审核通过
+                club.setAuditTime(time);
+                club.setAuditNote("后台客服确认注册默认审核通过");
+            } else {
+                // 机构名称
+                club.setName(clubTemporary.getLinkMan());
+                // 机构简称
+                club.setSname(clubTemporary.getLinkMan());
+            }
+            newCmClubDao.insert(club);
+            // user更新clubId
+            user.setClubID(club.getClubID().toString());
+            cmUserDao.update(user);
+            clubTemporary.setConfirmUserId(user.getUserID());
+            clubTemporaryDao.update(clubTemporary);
+        } else {
+            //客服二次确认注册
+            cmUserDao.updateByClubStatus(93, clubTemporary.getConfirmUserId());
+            newCmClubDao.updateByStatus(93, clubTemporary.getConfirmUserId());
+        }
+        User user = UserUtils.getUser();
+        ClubConfirmRecord confirmRecord = new ClubConfirmRecord();
+        confirmRecord.setSystemUserId(Integer.valueOf(user.getId()));
+        confirmRecord.setUserId(clubTemporary.getConfirmUserId());
+        //备注图片
+        String[] images = clubTemporary.getImages();
+        if (images != null && images.length > 0) {
+            StringBuilder remarkImage = new StringBuilder();
+            for (String image : images) {
+                if (StringUtils.isNotBlank(image)) {
+                    String url = UploadPicUtils.saveImageToServer(image);
+                    remarkImage.append(url).append(",");
+                }
+            }
+            confirmRecord.setImages(String.valueOf(remarkImage));
+        }
+        confirmRecord.setRemarks(clubTemporary.getRemarks());
+        confirmRecord.setConfirmTime(date);
+        clubTemporaryDao.insertClubConfirmRecord(confirmRecord);
+    }
+
+    public List<ClubConfirmRecord> confirmRecord(ClubTemporary clubTemporary) {
+        List<ClubConfirmRecord> recordList = null;
+        Integer userId = clubTemporary.getConfirmUserId();
+        if (userId != null) {
+            recordList = clubTemporaryDao.findConfirmRecord(userId);
+            if (recordList != null && recordList.size() > 0) {
+                recordList.forEach(record -> {
+                    User user = UserUtils.get(record.getSystemUserId().toString());
+                    if (user != null) {
+                        record.setSystemName(user.getName());
+                    }
+                    if (StringUtils.isNotBlank(record.getImages())) {
+                        String[] split = record.getImages().split(",");
+                        record.setRemarkImages(split);
+                    }
+                });
+            }
+        }
+        return recordList;
+    }
 
-	public ClubTemporary get(String id) {
-		return super.get(id);
-	}
-	
-	public List<ClubTemporary> findList(ClubTemporary clubTemporary) {
-		return super.findList(clubTemporary);
-	}
-	
-	public Page<ClubTemporary> findPage(Page<ClubTemporary> page, ClubTemporary clubTemporary) {
-		return super.findPage(page, clubTemporary);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(ClubTemporary clubTemporary) {
-		super.save(clubTemporary);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(ClubTemporary clubTemporary) {
-		super.delete(clubTemporary);
-	}
-	
+    public ClubTemporary findByConfirmUserId(Integer userId) {
+        return clubTemporaryDao.findByConfirmUserId(userId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.web;
 
+import com.caimei.modules.user.entity.ClubConfirmRecord;
 import com.caimei.modules.user.entity.ClubTemporary;
 import com.caimei.modules.user.service.ClubTemporaryService;
 import com.thinkgem.jeesite.common.config.Global;
@@ -17,6 +18,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 未确认机构Controller
@@ -77,4 +79,41 @@ public class ClubTemporaryController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/user/clubTemporary/?repage";
     }
 
+    /**
+     * 去确认注册页面
+     */
+    @RequestMapping("registerPage")
+    public String registerPage(ClubTemporary clubTemporary, Model model) {
+        model.addAttribute("clubTemporary", clubTemporary);
+        return "modules/user/registerPage";
+    }
+
+    /**
+     * 保存确认注册信息
+     */
+    @RequestMapping("registerSave")
+    public String registerSave(ClubTemporary clubTemporary, RedirectAttributes redirectAttributes) {
+        addMessage(redirectAttributes, "确认注册成功");
+        try {
+            clubTemporaryService.registerSave(clubTemporary);
+        } catch (Exception e) {
+            addMessage(redirectAttributes, e.getMessage());
+            e.printStackTrace();
+        }
+        return "redirect:" + Global.getAdminPath() + "/user/clubTemporary/?repage";
+    }
+
+    /**
+     * 确认记录
+     */
+    @RequestMapping("confirmRecord")
+    public String confirmRecord(ClubTemporary clubTemporary, Model model) {
+        if (StringUtils.isBlank(clubTemporary.getId())) {
+            clubTemporary = clubTemporaryService.findByConfirmUserId(clubTemporary.getConfirmUserId());
+        }
+        List<ClubConfirmRecord> recordList = clubTemporaryService.confirmRecord(clubTemporary);
+        model.addAttribute("recordList", recordList);
+        model.addAttribute("clubTemporary", clubTemporary);
+        return "modules/user/clubConfirmRecordList";
+    }
 }

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

@@ -5,6 +5,7 @@
 	<sql id="clubTemporaryColumns">
 		a.id AS "id",
 		a.userId AS "userId",
+		a.confirmUserId AS "confirmUserId",
 		a.name AS "name",
 		a.shortName AS "shortName",
 		a.bindMobile AS "bindMobile",
@@ -160,6 +161,7 @@
 	<update id="update">
 		UPDATE club_temporary SET 	
 			userId = #{userId},
+			confirmUserId = #{confirmUserId},
 			name = #{name},
 			shortName = #{shortName},
 			bindMobile = #{bindMobile},
@@ -186,5 +188,47 @@
 		DELETE FROM club_temporary
 		WHERE id = #{id}
 	</delete>
+
+	<insert id="insertClubConfirmRecord">
+		INSERT INTO `club_confirm_record` (
+		  `userId`,
+		  `systemUserId`,
+		  `images`,
+		  `remarks`,
+		  `confirmTime`
+		)
+		VALUES
+		  (
+			#{userId},
+			#{systemUserId},
+			#{images},
+			#{remarks},
+			#{confirmTime}
+		  )
+	</insert>
+
+	<select id="findConfirmRecord" resultType="com.caimei.modules.user.entity.ClubConfirmRecord">
+		SELECT
+		  `id`,
+		  `userId`,
+		  `systemUserId`,
+		  `images`,
+		  `remarks`,
+		  `confirmTime`
+		FROM
+		  `club_confirm_record`
+		WHERE
+		  userId = #{userId}
+		ORDER BY
+		  confirmTime DESC
+	</select>
+
+	<select id="findByConfirmUserId" resultType="com.caimei.modules.user.entity.ClubTemporary">
+		SELECT
+			<include refid="clubTemporaryColumns"/>
+		FROM club_temporary a
+		<include refid="clubTemporaryJoins"/>
+		WHERE a.confirmUserId = #{userId}
+	</select>
 	
 </mapper>

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

@@ -360,5 +360,13 @@
 		UPDATE serviceprovider SET
 		mainServiceProviderID = #{spManagerID}
 	</update>
+	
+	<select id="findByUserId" resultType="com.caimei.modules.user.entity.NewCmSp">
+		SELECT
+		<include refid="newCmSpColumns"/>
+		FROM serviceprovider a
+		<include refid="newCmSpJoins"/>
+		WHERE a.userID = #{userId}
+	</select>
 
 </mapper>

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

@@ -14,6 +14,7 @@
 		a.companyUserID AS "companyUserID",
 		a.openID AS "openID",
 		a.userName AS "userName",
+		a.source AS "source",
 		a.image AS "image",
 		a.password AS "password",
 		a.userLevelID AS "userLevelID",
@@ -234,6 +235,7 @@
 			userPermission,
 			email,
 			userName,
+			source,
 			image,
 			password,
 			userLevelID,
@@ -307,6 +309,7 @@
 			#{userPermission},
 			#{email},
 			#{userName},
+			#{source},
 			#{image},
 			#{password},
 			#{userLevelID},
@@ -783,6 +786,7 @@
 	<update id="updateUserBeans">
 		UPDATE USER SET userBeans = #{userBeans} WHERE userID = #{userID}
 	</update>
+
 	<select id="findUserByOrganizeId" resultType="com.caimei.modules.user.entity.CmUser">
 		SELECT
 		<include refid="cmUserColumns"/>
@@ -790,7 +794,12 @@
 		WHERE a.userOrganizeID=#{organizeId}
 		limit 1
 	</select>
+
 	<select id="getOrganizeStoreName" resultType="java.lang.String">
 		select name from cm_organize_store where id = #{organizeStoreId}
 	</select>
+
+	<update id="updateByClubStatus">
+		UPDATE user SET clubStatus = #{clubStatus} WHERE userID = #{confirmUserId}
+	</update>
 </mapper>

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

@@ -623,4 +623,8 @@
           )
     </insert>
 
+	<update id="updateByStatus">
+		UPDATE club SET status = #{clubStatus} WHERE userID = #{confirmUserId}
+	</update>
+
 </mapper>

src/main/webapp/WEB-INF/views/modules/order/shopOtherFeeForm.jsp

@@ -271,7 +271,7 @@
                 <sys:ckfinder input="remarkImage3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">
-                <form:hidden id="remarkImage4" path="" htmlEscape="false" maxlength="255" class="input-xlarge"/>
+                <form:hidden id="remarkImage4" path="remarkImages" htmlEscape="false" maxlength="255" class="input-xlarge"/>
                 <sys:ckfinder input="remarkImage4" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
             </div>
             <div class="conList hide-pic">

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

@@ -0,0 +1,111 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>未确认机构管理</title>
+    <meta name="decorator" content="default"/>
+    <script src="/static/modules/bulkpurchase/loadAddressById.js"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#inputForm").validate({
+                ignore: "",
+                submitHandler: function (form) {
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+
+
+        /**
+         * @param obj
+         * jquery控制input只能输入数字
+         */
+        function onlynum(obj) {
+            obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+        }
+
+        /**
+         * @param obj
+         * jquery控制input只能输入数字和两位小数
+         */
+        function num(obj) {
+            obj.value = obj.value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
+            obj.value = obj.value.replace(/^\./g, ""); //验证第一个字符是数字
+            obj.value = obj.value.replace(/\.{2,}/g, "."); //只保留第一个, 清除多余的
+            obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+            obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+        }
+
+    </script>
+    <style>
+        th {
+            text-align: right;
+            white-space: nowrap;
+        }
+
+        td {
+            padding: 5px 0;
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+    <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+    <li class="active"><a href="${ctx}/user/clubTemporary/confirmRecord?id=${clubTemporary.id}">确认记录</a></li>
+</ul>
+<form:form id="inputForm" modelAttribute="clubTemporary" action="" method="post" class="form-horizontal">
+    <div style="max-width:1200px;padding:15px;">
+        <table border="0" cellspacing="0" cellpadding="0" width="100%">
+            <tr style="height: 28px;background-color: rgb(242, 242, 242)">
+                <th style="width:10%">机构名称：</th>
+                <td style="width:25%">${empty clubTemporary.name ? "--------" : clubTemporary.name}</td>
+                <th style="width:10%">机构简称：</th>
+                <td style="width:55%">${empty clubTemporary.shortName ? "--------" : clubTemporary.shortName}</td>
+            </tr>
+            <tr style="height: 28px;background-color: rgb(242, 242, 242)">
+                <th style="width:10%">联系人：</th>
+                <td style="width:25%">
+                        ${clubTemporary.linkMan}
+                </td>
+                <th style="width:10%">手机号：</th>
+                <td style="width:55%">${clubTemporary.bindMobile}</td>
+            </tr>
+            <c:forEach items="${recordList}" var="record">
+                <tr height="35">
+                    <td style="text-align: right">${record.systemName}</td>
+                    <td colspan="3" style="text-indent:5em">确认时间：<fmt:formatDate value="${record.confirmTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+                </tr>
+                <c:if test="${not empty record.remarkImages}">
+                    <tr height="100">
+                        <th>图片备注：</th>
+                        <td colspan="3">
+                            <c:forEach items="${record.remarkImages}" var="image">
+                                <img src="${image}" style="height: 70px;width: 65px">
+                            </c:forEach>
+                        </td>
+                    </tr>
+                </c:if>
+                <tr height="30">
+                    <th>文字备注：</th>
+                    <td colspan="3">${record.remarks}</td>
+                </tr>
+                <tr height="25">
+                    <td colspan="4" style="border-bottom: 1px dashed #aaa"></td>
+                </tr>
+            </c:forEach>
+        </table>
+    </div>
+</form:form>
+</body>
+</html>

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

@@ -93,8 +93,8 @@
 				</td>
 				<td>
     				<a href="${ctx}/user/clubTemporary/form?id=${club.id}">编辑</a>
-					<a>确认注册</a>
-					<a>确认记录</a>
+					<a href="${ctx}/user/clubTemporary/registerPage?id=${club.id}">确认注册</a>
+					<a href="${ctx}/user/clubTemporary/confirmRecord?id=${club.id}">确认记录</a>
 					<%--<a href="${ctx}/user/clubTemporary/delete?id=${club.id}" onclick="return confirmx('确认要删除该未确认机构吗？', this.href)">删除</a>--%>
 				</td>
 			</tr>

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

@@ -0,0 +1,272 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>未确认机构管理</title>
+    <meta name="decorator" content="default"/>
+    <script src="/static/modules/bulkpurchase/loadAddressById.js"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#inputForm").validate({
+                ignore: "",
+                submitHandler: function (form) {
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
+
+
+        /**
+         * @param obj
+         * jquery控制input只能输入数字
+         */
+        function onlynum(obj) {
+            obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
+        }
+
+        /**
+         * @param obj
+         * jquery控制input只能输入数字和两位小数
+         */
+        function num(obj) {
+            obj.value = obj.value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
+            obj.value = obj.value.replace(/^\./g, ""); //验证第一个字符是数字
+            obj.value = obj.value.replace(/\.{2,}/g, "."); //只保留第一个, 清除多余的
+            obj.value = obj.value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+            obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+        }
+
+    </script>
+    <style>
+        th {
+            text-align: right;
+            white-space: nowrap;
+        }
+
+        td {
+            padding: 5px 0;
+        }
+
+        .controls .conList{
+            display: inline-block;
+            margin-right: 15px;
+        }
+        .conList .btn:nth-of-type(1){
+            margin-left: 25px;
+        }
+        .upload-content {
+            margin-top: -70px;
+            display: inline-block;
+        }
+        .upload-content .conList .btn:nth-of-type(1) {
+            width: 90px;
+            height: 100px;
+            border: 2px solid #eee;
+            background: #fff;
+            position: relative;
+        }
+        .upload-content .conList .btn:nth-of-type(1)>div {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            color: #666;
+        }
+        .upload-content .conList .btn:nth-of-type(1) span {
+            font-size: 35px;
+        }
+        .upload-content .conList .btn:nth-of-type(1) h5 {
+            color: #666;
+        }
+        .cancel-upload {
+            background: transparent;
+            border: none;
+            box-shadow: none;
+            position: relative;
+            top: -38px;
+            left: -25px;
+            cursor: pointer;
+            z-index: 100;
+        }
+        .upload-content .conList ol li {
+            width: 114px;
+            min-height: 80px;
+            text-align: center;
+            background: #fff;
+            position: relative;
+            top: 120px;
+            margin-left: 2px;
+        }
+        .hide-pic {
+            display: none !important;
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+    <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+    <li class="active"><a href="${ctx}/user/clubTemporary/registerPage?id=${clubTemporary.id}">确认注册</a></li>
+</ul>
+<form:form id="inputForm" modelAttribute="clubTemporary" action="${ctx}/user/clubTemporary/registerSave" method="post" class="form-horizontal">
+<form:hidden path="id"/>
+<form:hidden path="userId" id="userId"/>
+<div style="max-width:1200px;padding:15px;">
+    <table border="0" cellspacing="0" cellpadding="0" width="100%">
+        <tr style="height: 28px;background-color: rgb(242, 242, 242)">
+            <th style="width:10%">机构名称：</th>
+            <td style="width:25%">${empty clubTemporary.name ? "--------" : clubTemporary.name}</td>
+            <th style="width:10%">机构简称：</th>
+            <td style="width:55%">${empty clubTemporary.shortName ? "--------" : clubTemporary.shortName}</td>
+        </tr>
+        <tr style="height: 28px;background-color: rgb(242, 242, 242)">
+            <th style="width:10%">联系人：</th>
+            <td style="width:25%">
+                    ${clubTemporary.linkMan}
+            </td>
+            <th style="width:10%">手机号：</th>
+            <td style="width:55%">${clubTemporary.bindMobile}</td>
+        </tr>
+        <tr height="35">
+            <td colspan="4" style="text-indent:2em">确认该机构注册采美吗？请详细填写确认的备注信息</td>
+        </tr>
+        <tr height="150">
+            <th>图片备注：</th>
+            <td colspan="3">
+                <div class="controls upload-content" style="margin: -91px 0px 0px 16px;" id="imagesBox">
+                    <div class="conList">
+                        <input type="hidden" name="images" id="images1">
+                        <sys:ckfinder input="images1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images2">
+                        <sys:ckfinder input="images2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images3">
+                        <sys:ckfinder input="images3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images4">
+                        <sys:ckfinder input="images4" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images5">
+                        <sys:ckfinder input="images5" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images6">
+                        <sys:ckfinder input="images6" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images7">
+                        <sys:ckfinder input="images7" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList hide-pic">
+                        <input type="hidden" name="images" id="images8">
+                        <sys:ckfinder input="images8" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList  hide-pic">
+                        <input type="hidden" name="images" id="images9">
+                        <sys:ckfinder input="images9" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                    <div class="conList  hide-pic">
+                        <input type="hidden" name="images" id="images10">
+                        <sys:ckfinder input="images10" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr height="100">
+            <th><font color="red">*</font> 文字备注：</th>
+            <td colspan="3">
+                <textarea style="width: 350px;height: 75px" name="remarks" required placeholder="必填，不超过200字"></textarea>
+            </td>
+        </tr>
+    </table>
+</div>
+<div class="form-actions">
+    <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;&nbsp;&nbsp;
+    <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+</div>
+</form:form>
+<script>
+
+    //图片初始化
+    $(function () {
+        $('.upload-content .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
+        $('.upload-content .conList .btn:nth-of-type(2)').after('<img class="cancel-upload" src="/static/images/close-btn1.png">').remove();
+        $('.upload-content .conList').find('.cancel-upload').hide();
+        var observeEle = document.getElementsByClassName('upload-content')[0];
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+        var MutationObserverConfig={
+            childList: true,
+            subtree: true,
+            characterData: true
+        };
+        var observer = new MutationObserver(function(mutations){
+            $.each(mutations, function(index,item) {
+                if (item.type === 'childList') {
+                    // 在创建新的 element 时调用
+                    var target = $(item.target),
+                        thisWrapper = target.closest('.conList'),
+                        nextEle = thisWrapper.next();
+                    thisWrapper.find('li').css('z-index',99);
+                    thisWrapper.find('.cancel-upload').show();
+                    if(nextEle.hasClass('hide-pic')) {
+                        nextEle.removeClass('hide-pic');
+                    }
+                }
+            })
+        });
+        observer.observe(observeEle,MutationObserverConfig);
+
+        $('body').on('click','.upload-content li',function() {
+            var index = $(this).closest('.conList').index() + 1,
+                str = 'images'+index+'FinderOpen';
+            eval(str+'()');
+        });
+        $('body').on('click', '.cancel-upload',function() {
+            var wrapper = $(this).closest('.conList');
+            wrapper.find('li').css('z-index','-1');
+            wrapper.find('input').val('');
+            $(this).hide();
+            if ($('.cancel-upload:visible').length < 9) {
+                wrapper.addClass("hide-pic");
+            }else{
+                wrapper.removeClass("hide-pic");
+            }
+            wrapper.parent().append(wrapper.clone());
+            wrapper.remove();
+            $(".conList").each(function(i,ele){
+                if($(ele).find("input.input-xlarge").val()){
+                    $(ele).next().removeClass("hide-pic")
+                }
+            })
+        });
+        $(window).on("load", function(){
+            setTimeout(function(){
+                $("#imagesBox").find("input.input-xlarge").each(function(i,ele){
+                    if($(ele).val()){
+                        $(ele).next().find("li").css("z-index","99");
+                        $(ele).parents(".conList").find(".cancel-upload").show();
+                        $(ele).parents(".conList").next().removeClass("hide-pic")
+                    }
+                })
+            },500);
+        });
+    });
+</script>
+
+</body>
+</html>

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

@@ -383,6 +383,12 @@
                         <a href="JavaScript:;" onclick="return alertx('不通过原因：${newCmClubList.auditNote}')"
                            style="text-decoration:underline;"><font color="red">审核未通过</font></a>
                     </c:when>
+                    <c:when test="${newCmClubList.status eq 93}">
+                        <font color="#BF826C">已确认</font>
+                    </c:when>
+                    <c:when test="${newCmClubList.status eq 94}">
+                        <font color="red">已冻结</font>
+                    </c:when>
                     <c:otherwise>
                         ${fns:getDictLabel(newCmClubList.status, 'club_status', newCmClubList.status)}
                     </c:otherwise>
@@ -433,8 +439,10 @@
                     <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">
                         <a href="javascript:void(0);" onclick="toAudit(${newCmClubList.clubID},'${newCmClubList.userName}','${newCmClubList.bindMobile}')">审核</a>
                     </c:if>
-                    <a href="javascript:void(0);"
-                       onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构类别</a>
+                    <a href="javascript:void(0);" onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构类别</a>
+                    <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
+                        <a href="${ctx}/user/clubTemporary/confirmRecord?confirmUserId=${newCmClubList.userID}">确认记录</a>
+                    </c:if>
                 </td>
             </shiro:hasPermission>
         </tr>