Merge branch 'developer' into developerE

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

@@ -1,6 +1,7 @@
 package com.caimei.modules.user.dao;
 
 import com.caimei.modules.order.entity.OrderUserInfo;
+import com.caimei.modules.user.entity.CmOrganValueSystem;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.po.neworder.CmShopOrder;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
@@ -82,4 +83,8 @@ public interface CmUserDao extends CrudDao<CmUser> {
     Date findByConfirmTime(Integer userId);
 
     Integer findUserBeans(Integer userId);
+
+    CmOrganValueSystem selOrgan(Integer userId);
+
+    void insertOrgan(@Param("userId") Integer userId);
 }

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

@@ -0,0 +1,66 @@
+package com.caimei.modules.user.entity;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/11/22
+ */
+public class CmOrganValueSystem {
+
+    private Integer organID;
+    private Integer userID; //用户id
+    private String activeState;//活跃状态
+    private String customerValue;//客户价值
+    private Integer stage;//阶段：0本阶段 1上阶段 2其他阶段
+    private Integer delType;//是否启用：0禁用状态，1启用状态（本阶段启用，其他阶段禁用）
+
+
+    public Integer getOrganID() {
+        return organID;
+    }
+
+    public void setOrganID(Integer organID) {
+        this.organID = organID;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
+    public String getActiveState() {
+        return activeState;
+    }
+
+    public void setActiveState(String activeState) {
+        this.activeState = activeState;
+    }
+
+    public String getCustomerValue() {
+        return customerValue;
+    }
+
+    public void setCustomerValue(String customerValue) {
+        this.customerValue = customerValue;
+    }
+
+    public Integer getStage() {
+        return stage;
+    }
+
+    public void setStage(Integer stage) {
+        this.stage = stage;
+    }
+
+    public Integer getDelType() {
+        return delType;
+    }
+
+    public void setDelType(Integer delType) {
+        this.delType = delType;
+    }
+}

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

@@ -206,6 +206,13 @@ public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemp
         }
         confirmRecord.setRemarks(clubTemporary.getRemarks());
         confirmRecord.setConfirmTime(date);
+
+        // 未确认机构确认注册时，给予初始机构信息，活跃状态、客户价值为null
+        CmOrganValueSystem insUser = cmUserDao.selOrgan(clubTemporary.getConfirmUserId());
+        if (insUser == null) {
+            cmUserDao.insertOrgan(clubTemporary.getConfirmUserId());
+        }
+
         clubTemporaryDao.insertClubConfirmRecord(confirmRecord);
     }
 
@@ -233,4 +240,4 @@ public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemp
     public ClubTemporary findByConfirmUserId(Integer userId) {
         return clubTemporaryDao.findByConfirmUserId(userId);
     }
-}
+}

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

@@ -266,7 +266,7 @@ public class NewCmShopController extends BaseController {
         CmOperationalLogs sysLog = new CmOperationalLogs();
         try {
             Date date = new Date();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String format = sdf.format(date);
             String manufacturerStatus = "";
             String smsMessage = "";

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

@@ -617,4 +617,12 @@
 		from user
 		where userID = #{userId}
 	</select>
+	<select id="selOrgan" resultType="com.caimei.modules.user.entity.CmOrganValueSystem">
+		select * from cm_organ_value_system where userID = #{userId} and stage = 0 limit 1
+	</select>
+	<insert id="insertOrgan">
+		INSERT INTO cm_organ_value_system
+		(userID, stage, delType)
+		VALUES(#{userId},0,1)
+	</insert>
 </mapper>

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

@@ -251,8 +251,22 @@
                     <font color="red">(普通会员)</font>
                 </c:if>
             </td>
-            <td>${newCmClubList.activeState}</td>
-            <td>${newCmClubList.customerValue}</td>
+            <td>
+                <c:if test="${newCmClubList.activeState == null || newCmClubList.activeState == ''}">
+                    ---
+                </c:if>
+                <c:if test="${newCmClubList.activeState != null || newCmClubList.activeState != ''}">
+                    ${newCmClubList.activeState}
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${newCmClubList.customerValue == null || newCmClubList.customerValue == ''}">
+                    ---
+                </c:if>
+                <c:if test="${newCmClubList.customerValue != null || newCmClubList.customerValue != ''}">
+                    ${newCmClubList.customerValue}
+                </c:if>
+            </td>
 
             <td>
                 <c:if test="${newCmClubList.registerIP eq '192.168.1.10'}">