Browse Source

Merge branch 'test3' into test

# Conflicts:
#	src/main/java/com/goafanti/common/dao/UserDataLogMapper.java
#	src/main/java/com/goafanti/common/mapper/UserDataLogMapper.xml
#	src/main/java/com/goafanti/common/model/UserDataLog.java
#	src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java
anderx 1 year ago
parent
commit
cca997c319

+ 3 - 5
src/main/java/com/goafanti/common/dao/UserDataLogMapper.java

@@ -3,7 +3,6 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.UserDataLog;
 import com.goafanti.customer.bo.OutUserDateLogList;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -11,7 +10,7 @@ import java.util.List;
  * 用户信息日志(UserDataLog)表数据库访问层
  *
  * @author makejava
- * @since 2024-09-25 15:55:04
+ * @since 2024-09-29 09:52:13
  */
 public interface UserDataLogMapper {
 
@@ -23,6 +22,7 @@ public interface UserDataLogMapper {
      */
     UserDataLog queryById(Integer id);
 
+    int insert(UserDataLog record);
 
     /**
      * 查询指定行数据
@@ -82,8 +82,6 @@ public interface UserDataLogMapper {
      */
     int deleteById(Integer id);
 
-    int insertSelective(UserDataLog record);
 
     List<OutUserDateLogList> userDateLogList(String uid);
-}
-
+}

+ 80 - 164
src/main/java/com/goafanti/common/mapper/UserDataLogMapper.xml

@@ -1,169 +1,85 @@
 <?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.goafanti.common.dao.UserDataLogMapper">
-    <resultMap type="com.goafanti.common.model.UserDataLog" id="UserDataLogMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="uid" column="uid" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
-        <result property="type" column="type" jdbcType="INTEGER"/>
-    </resultMap>
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserDataLog">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, `uid`, create_time, remarks
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from user_data_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
 
-    <sql id="UserDataLogAllSql">
-        id, uid, create_time, remarks, type
-    </sql>
-
-    <!--查询单个-->
-    <select id="queryById" resultMap="UserDataLogMap">
-        select
-        <include refid="UserDataLogAllSql"/>
-        from user_data_log
-        where id = #{id}
-    </select>
-
-    <!--查询指定行数据-->
-    <select id="findUserDataLogList" resultMap="UserDataLogMap">
-        select
-        <include refid="UserDataLogAllSql"/>
-
-        from user_data_log
-        <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="uid != null and uid != ''">
-                and uid = #{uid}
-            </if>
-            <if test="createTime != null">
-                and create_time = #{createTime}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                and remarks = #{remarks}
-            </if>
-            <if test="type != null">
-                and type = #{type}
-            </if>
-        </where>
-        <if test="page_sql != null">
-            ${page_sql}
-        </if>
-    </select>
-
-    <!--统计总行数-->
-    <select id="findUserDataLogCount" resultType="java.lang.Integer">
-        select count(1)
-        from user_data_log
-        <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="uid != null and uid != ''">
-                and uid = #{uid}
-            </if>
-            <if test="createTime != null">
-                and create_time = #{createTime}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                and remarks = #{remarks}
-            </if>
-            <if test="type != null">
-                and type = #{type}
-            </if>
-        </where>
-    </select>
-
-    <!--新增所有列-->
-    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into user_data_log(uid, create_time, remarks, type)
-        values (#{uid}, #{createTime}, #{remarks}, #{type})
-    </insert>
-
-    <insert id="insertBatch" >
-        insert into user_data_log(uid, create_time, remarks, type)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.createTime}, #{entity.remarks}, #{entity.type})
-        </foreach>
-    </insert>
-
-    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into user_data_log(uid, create_time, remarks, type)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.createTime}, #{entity.remarks}, #{entity.type})
-        </foreach>
-        on duplicate key update
-        uid = values(uid),
-        create_time = values(create_time),
-        remarks = values(remarks),
-        type = values(type)
-    </insert>
-
-    <!--通过主键修改数据-->
-    <update id="update">
-        update user_data_log
-        <set>
-            <if test="uid != null and uid != ''">
-                uid = #{uid},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime},
-            </if>
-            <if test="remarks != null and remarks != ''">
-                remarks = #{remarks},
-            </if>
-            <if test="type != null">
-                type = #{type},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <!--通过主键删除-->
-    <delete id="deleteById">
-        delete
-        from user_data_log
-        where id = #{id}
-    </delete>
-
-    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserDataLog" useGeneratedKeys="true">
-        insert into user_data_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="uid != null">
-                `uid`,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="remarks != null">
-                remarks,
-            </if>
-            <if test="type != null">
-                type ,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="uid != null">
-                #{uid,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="remarks != null">
-                #{remarks,jdbcType=VARCHAR},
-            </if>
-            <if test="type != null">
-                 #{type},
-            </if>
-        </trim>
-    </insert>
-
-    <select id="userDateLogList" resultType="com.goafanti.customer.bo.OutUserDateLogList">
-        select id,uid,remarks ,create_time ,
-               date_format(create_time ,'%Y-%m-%d %H:%i:%s')createTimes
-        from user_data_log
-        where uid= #{uid}
-        order by create_time desc
-    </select>
-</mapper>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from user_data_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserDataLog" useGeneratedKeys="true">
+    insert into user_data_log (`uid`, create_time, remarks
+      )
+    values (#{uid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserDataLog" useGeneratedKeys="true">
+    insert into user_data_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserDataLog">
+    update user_data_log
+    <set>
+      <if test="uid != null">
+        `uid` = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserDataLog">
+    update user_data_log
+    set `uid` = #{uid,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      remarks = #{remarks,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 
+  <select id="userDateLogList" resultType="com.goafanti.customer.bo.OutUserDateLogList">
+    select id,uid,remarks ,create_time ,
+    date_format(create_time ,'%Y-%m-%d %H:%i:%s')createTimes
+    from user_data_log
+    where uid= #{uid}
+    order by create_time desc
+  </select>
+</mapper>

+ 9 - 9
src/main/java/com/goafanti/common/model/UserDataLog.java

@@ -3,12 +3,9 @@ package com.goafanti.common.model;
 import java.io.Serializable;
 import java.util.Date;
 
-
 /**
- * 用户信息日志(UserDataLog)实体类
- *
- * @author makejava
- * @since 2024-09-25 15:55:04
+ * user_data_log
+ * @author 
  */
 public class UserDataLog implements Serializable {
     private static final long serialVersionUID = 778546039023430919L;
@@ -16,14 +13,17 @@ public class UserDataLog implements Serializable {
      * 日志编号
      */
     private Integer id;
+
     /**
      * 用户ID
      */
     private String uid;
+
     /**
      * 创建时间
      */
     private Date createTime;
+
     /**
      * 备注
      */
@@ -36,14 +36,15 @@ public class UserDataLog implements Serializable {
     public UserDataLog(String uid,String remarks){
         setUid(uid);
         setRemarks(remarks);
-        setCreateTime(new Date());
         setType(0);
+        setCreateTime(new Date());
     }
+
     public UserDataLog(String uid,String remarks,Integer type){
         setUid(uid);
         setRemarks(remarks);
-        setCreateTime(new Date());
         setType(type);
+        setCreateTime(new Date());
     }
 
     public UserDataLog() {
@@ -89,5 +90,4 @@ public class UserDataLog implements Serializable {
         this.type = type;
     }
 
-}
-
+}

+ 4 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1376,10 +1376,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		//记录旧数据值,与新数据值 将旧数据与新数据都需要更新
 		List<User> useList=new ArrayList<>();
 		List<User> newList=new ArrayList<>();
-		//领取
 		boolean typeFlag = AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)
 				|| AFTConstants.SIGN_USER_TRANSFER_TO_OTHER.equals(operatorType)
 				|| AFTConstants.CHANNEL_USER_TRANSFER_TO_OTHER.equals(operatorType);
+		//领取
 		if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
 			User use = userMapper.selectByPrimaryKey(uid);
 			user.setAid(TokenManager.getAdminId());
@@ -1396,7 +1396,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 //			organizationContactBookMapper.updateAdmin(uid,aid);
 			//转交
 		} else if (typeFlag) {
-
 			if (!isUs) {
 				user.setAid(aid);
 				if (data==1||data==3){
@@ -1586,14 +1585,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public Integer receiveEveryDay(String uid) {
+		Integer signBills =null;
 		if (uid !=null ){
 			User u=userMapper.selectByPrimaryKey(uid);
+			signBills = u.getSignBills();
 			if (u.getShareType()!=1)return -1;
 			if (u.getNewChannel()==1)return 0;
 		}
 		int privateCount = userMapper.UserReceiveCount(TokenManager.getAdminId());
 		if (privateCount >= USER_RECEIVE_MAX)return  -2;
-		if(checkMax(uid,TokenManager.getAdminId()))return -3;
+		if((signBills==null||signBills==0)&&checkMax(uid,TokenManager.getAdminId()))return -3;
 		if(checkBeforeChannel(uid)) return -4;
 		return 0;
 	}