新增修改 小程序相关接口

ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemManager.java

@@ -27,4 +27,6 @@ public interface ItemManager {
     long countByCid(Integer cid);
 
     int insert(Item item);
+
+    int update(Item item);
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserDao.java

+package com.wwdz.ch.db.dao;
+
+import com.wwdz.ch.db.domain.User;
+
+public interface UserDao {
+    User queryByOid(String openId);
+
+    User queryByMobile(String mobile);
+
+    User queryById(Long id);
+
+    int insert(User user);
+
+    int updateById(User user);
+
+    boolean isExistedByMobile(String beforeMobile, String afterMobile);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/ItemManagerImpl.java

@@ -119,4 +119,9 @@ public class ItemManagerImpl implements ItemManager {
     public int insert(Item item) {
         return itemMapper.insert(item);
     }
+
+    @Override
+    public int update(Item item) {
+        return itemMapper.updateByPrimaryKeySelective(item);
+    }
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/UserDaoImpl.java

+package com.wwdz.ch.db.dao.impl;
+
+import com.wwdz.ch.db.dao.UserDao;
+import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.db.domain.UserExample;
+import com.wwdz.ch.db.mapper.UserMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+@Repository
+public class UserDaoImpl implements UserDao {
+    @Autowired
+    private UserMapper userMapper;
+
+    @Override
+    public User queryByOid(String openId) {
+        UserExample example = new UserExample();
+        example.or().andWeixinOpenidEqualTo(openId).andDeletedEqualTo(false);
+        return userMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public User queryByMobile(String mobile) {
+        UserExample example = new UserExample();
+        example.or().andMobileEqualTo(mobile).andDeletedEqualTo(false);
+        return userMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public User queryById(Long id) {
+        UserExample example = new UserExample();
+        example.or().andIdEqualTo(id).andDeletedEqualTo(false);
+        return userMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public int insert(User user) {
+        return userMapper.insert(user);
+    }
+
+    @Override
+    public int updateById(User user) {
+        user.setUpdateTime(new Date());
+        return userMapper.updateByPrimaryKeySelective(user);
+    }
+
+    @Override
+    public boolean isExistedByMobile(String beforeMobile, String afterMobile) {
+        UserExample example = new UserExample();
+        UserExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(beforeMobile)) {
+            criteria.andMobileNotEqualTo(beforeMobile);
+        }
+        criteria.andMobileEqualTo(afterMobile);
+        criteria.andDeletedEqualTo(false);
+        return userMapper.countByExample(example) > 0;
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/mapper/FootprintMapper.java

@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
 public interface FootprintMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     long countByExample(FootprintExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int deleteByExample(FootprintExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int insert(Footprint record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int insertSelective(Footprint record);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -59,7 +28,7 @@ public interface FootprintMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -68,82 +37,46 @@ public interface FootprintMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     List<Footprint> selectByExampleSelective(@Param("example") FootprintExample example, @Param("selective") Footprint.Column ... selective);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     List<Footprint> selectByExample(FootprintExample example);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     Footprint selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") Footprint.Column ... selective);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     Footprint selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     Footprint selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int updateByExampleSelective(@Param("record") Footprint record, @Param("example") FootprintExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int updateByExample(@Param("record") Footprint record, @Param("example") FootprintExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int updateByPrimaryKeySelective(Footprint record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
-     *
-     * @mbg.generated
-     */
     int updateByPrimaryKey(Footprint record);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -152,7 +85,7 @@ public interface FootprintMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_footprint
+     * This method corresponds to the database table footprint
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin

ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserMapper.java

@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserExample;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
 public interface UserMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     long countByExample(UserExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int deleteByExample(UserExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int insert(User record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int insertSelective(User record);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -59,7 +28,7 @@ public interface UserMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -68,82 +37,46 @@ public interface UserMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     List<User> selectByExampleSelective(@Param("example") UserExample example, @Param("selective") User.Column ... selective);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     List<User> selectByExample(UserExample example);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     User selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") User.Column ... selective);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     User selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     User selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int updateByPrimaryKeySelective(User record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
-     *
-     * @mbg.generated
-     */
     int updateByPrimaryKey(User record);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
@@ -152,7 +85,7 @@ public interface UserMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table dts_user
+     * This method corresponds to the database table user
      *
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFootprintService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.FootprintMapper;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
-
+import com.wwdz.ch.db.mapper.FootprintMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -34,8 +33,8 @@ public class DtsFootprintService {
 	}
 
 	public void add(Footprint footprint) {
-		footprint.setAddTime(LocalDateTime.now());
-		footprint.setUpdateTime(LocalDateTime.now());
+		footprint.setAddTime(new Date());
+		footprint.setUpdateTime(new Date());
 		footprintMapper.insertSelective(footprint);
 	}
 
@@ -48,7 +47,7 @@ public class DtsFootprintService {
 			criteria.andUserIdEqualTo(Long.valueOf(userId));
 		}
 		if (!StringUtils.isEmpty(coinsId)) {
-			criteria.andCoinsIdEqualTo(Long.valueOf(coinsId));
+			criteria.andItemIdEqualTo(Long.valueOf(coinsId));
 		}
 		criteria.andDeletedEqualTo(false);
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserService.java

 package com.wwdz.ch.db.service;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.bean.DayStatis;
-import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
-import com.wwdz.ch.db.mapper.UserMapper;
-import com.wwdz.ch.db.mapper.ex.StatMapper;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserExample;
 import com.wwdz.ch.db.domain.UserVo;
+import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserMapper;
+import com.wwdz.ch.db.mapper.ex.StatMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class DtsUserService {
@@ -48,13 +46,13 @@ public class DtsUserService {
 	}
 
 	public void add(User user) {
-		user.setAddTime(LocalDateTime.now());
-		user.setUpdateTime(LocalDateTime.now());
+		user.setAddTime(new Date());
+		user.setUpdateTime(new Date());
 		userMapper.insertSelective(user);
 	}
 
 	public int updateById(User user) {
-		user.setUpdateTime(LocalDateTime.now());
+		user.setUpdateTime(new Date());
 		return userMapper.updateByPrimaryKeySelective(user);
 	}
 

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FootprintMapper.xml

@@ -2,22 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wwdz.ch.db.mapper.FootprintMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Footprint">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="coins_id" jdbcType="BIGINT" property="coinsId" />
+    <result column="item_id" jdbcType="BIGINT" property="itemId" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
   <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
         <if test="criteria.valid">
@@ -47,10 +39,6 @@
     </where>
   </sql>
   <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
         <if test="criteria.valid">
@@ -80,21 +68,14 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    id, user_id, coins_id, add_time, update_time, deleted
+    id, user_id, item_id, add_time, update_time, deleted
   </sql>
   <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     select
     <if test="distinct">
       distinct
     </if>
+    'true' as QUERYID,
     <include refid="Base_Column_List" />
     from footprint
     <if test="_parameter != null">
@@ -111,6 +92,7 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
+    'true' as QUERYID,
     <if test="example.distinct">
       distinct
     </if>
@@ -121,7 +103,7 @@
         </foreach>
       </when>
       <otherwise>
-        id, user_id, coins_id, add_time, update_time, deleted
+        id, user_id, item_id, add_time, update_time, deleted
       </otherwise>
     </choose>
     from footprint
@@ -133,10 +115,6 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     select 
     <include refid="Base_Column_List" />
     from footprint
@@ -148,10 +126,6 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     select 
     <include refid="Base_Column_List" />
     from footprint
@@ -180,48 +154,32 @@
         </foreach>
       </when>
       <otherwise>
-        id, user_id, coins_id, add_time, update_time, deleted
+        id, user_id, item_id, add_time, update_time, deleted
       </otherwise>
     </choose>
     from footprint
     where id = #{id,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     delete from footprint
     where id = #{id,jdbcType=BIGINT}
   </delete>
   <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     delete from footprint
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" parameterType="com.wwdz.ch.db.domain.Footprint">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into footprint (user_id, coins_id, add_time, 
+    insert into footprint (user_id, item_id, add_time, 
       update_time, deleted)
-    values (#{userId,jdbcType=BIGINT}, #{coinsId,jdbcType=BIGINT}, #{addTime,jdbcType=TIMESTAMP}, 
+    values (#{userId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, #{addTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.Footprint">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -230,8 +188,8 @@
       <if test="userId != null">
         user_id,
       </if>
-      <if test="coinsId != null">
-        coins_id,
+      <if test="itemId != null">
+        item_id,
       </if>
       <if test="addTime != null">
         add_time,
@@ -247,8 +205,8 @@
       <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
-      <if test="coinsId != null">
-        #{coinsId,jdbcType=BIGINT},
+      <if test="itemId != null">
+        #{itemId,jdbcType=BIGINT},
       </if>
       <if test="addTime != null">
         #{addTime,jdbcType=TIMESTAMP},
@@ -262,20 +220,12 @@
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     select count(*) from footprint
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update footprint
     <set>
       <if test="record.id != null">
@@ -284,8 +234,8 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=BIGINT},
       </if>
-      <if test="record.coinsId != null">
-        coins_id = #{record.coinsId,jdbcType=BIGINT},
+      <if test="record.itemId != null">
+        item_id = #{record.itemId,jdbcType=BIGINT},
       </if>
       <if test="record.addTime != null">
         add_time = #{record.addTime,jdbcType=TIMESTAMP},
@@ -302,14 +252,10 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update footprint
     set id = #{record.id,jdbcType=BIGINT},
       user_id = #{record.userId,jdbcType=BIGINT},
-      coins_id = #{record.coinsId,jdbcType=BIGINT},
+      item_id = #{record.itemId,jdbcType=BIGINT},
       add_time = #{record.addTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       deleted = #{record.deleted,jdbcType=BIT}
@@ -318,17 +264,13 @@
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.Footprint">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update footprint
     <set>
       <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT},
       </if>
-      <if test="coinsId != null">
-        coins_id = #{coinsId,jdbcType=BIGINT},
+      <if test="itemId != null">
+        item_id = #{itemId,jdbcType=BIGINT},
       </if>
       <if test="addTime != null">
         add_time = #{addTime,jdbcType=TIMESTAMP},
@@ -343,13 +285,9 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.Footprint">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
     update footprint
     set user_id = #{userId,jdbcType=BIGINT},
-      coins_id = #{coinsId,jdbcType=BIGINT},
+      item_id = #{itemId,jdbcType=BIGINT},
       add_time = #{addTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       deleted = #{deleted,jdbcType=BIT}
@@ -362,6 +300,7 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
+    'true' as QUERYID,
     <include refid="Base_Column_List" />
     from footprint
     <if test="_parameter != null">
@@ -379,6 +318,7 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
+    'true' as QUERYID,
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
@@ -386,7 +326,7 @@
         </foreach>
       </when>
       <otherwise>
-        id, user_id, coins_id, add_time, update_time, deleted
+        id, user_id, item_id, add_time, update_time, deleted
       </otherwise>
     </choose>
     from footprint

ch-wx-api/src/main/java/com/wwdz/ch/wx/dao/UserInfo.java

@@ -26,6 +26,8 @@ public class UserInfo implements Serializable {
 	
 	private Byte status;//状态
 	private String registerDate;//注册日期
+	// 微信号
+	private String wechatId;
 
 	public String getCountry() {
 		return country;
@@ -99,6 +101,14 @@ public class UserInfo implements Serializable {
 		this.phone = phone;
 	}
 
+	public String getWechatId() {
+		return wechatId;
+	}
+
+	public void setWechatId(String wechatId) {
+		this.wechatId = phone;
+	}
+
 	public Byte getUserLevel() {
 		return userLevel;
 	}

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/UserRequestDto.java

+package com.wwdz.ch.wx.entity.request;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class UserRequestDto implements Entity {
+    private Long userId;
+    private String mobile;
+    private String code;
+    private String avatarUrl;
+    private Long shareUserId;
+    private String nickname;
+    private String wechatId;
+    private String beforeMobile;
+    private String afterMobile;
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/CategoryImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/CategoryImpl.java

-package com.wwdz.ch.wx.service.impl;
+package com.wwdz.ch.wx.impl;
 
 import com.wwdz.ch.wx.service.CategoryService;
 import org.springframework.stereotype.Service;

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/FavoritesServiceImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

-package com.wwdz.ch.wx.service.impl;
+package com.wwdz.ch.wx.impl;
 
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.UserItemsRelationDao;
@@ -31,11 +31,11 @@ public class FavoritesServiceImpl implements FavoritesService {
     private static final Logger logger = LoggerFactory.getLogger(FavoritesServiceImpl.class);
 
     @Autowired
-    private FavoritesDao favoritesManager;
+    private FavoritesDao favoritesDao;
     @Autowired
-    private FavoritesItemsRelationDao favoritesItemsRelationManager;
+    private FavoritesItemsRelationDao favoritesItemsRelationDao;
     @Autowired
-    private UserItemsRelationDao userItemsRelationManager;
+    private UserItemsRelationDao userItemsRelationDao;
     @Autowired
     private ItemManager itemManager;
 
@@ -53,7 +53,7 @@ public class FavoritesServiceImpl implements FavoritesService {
             favorites.setUpdateTime(date);
             favorites.setDeleted(false);
             favorites.setSort(1);
-            favoritesManager.insert(favorites);
+            favoritesDao.insert(favorites);
             return Result.success();
         } catch (Exception e) {
             logger.error("新建默认收藏册失败，原因：" + e.getMessage(), e);
@@ -65,7 +65,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result page(FavoritesRequestDto dto) {
         try {
-            return Result.success(favoritesManager.pageByUserId(dto.getUserId(), dto.getPage(), dto.getSize()));
+            return Result.success(favoritesDao.pageByUserId(dto.getUserId(), dto.getPage(), dto.getSize()));
         } catch (Exception e) {
             logger.error("查询收藏册列表失败，原因：" + e.getMessage(), e);
             return Result.failed(-1, "查询收藏册列表失败");
@@ -75,7 +75,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result list(FavoritesRequestDto dto) {
         try {
-            return Result.success(favoritesManager.listByUserId(dto.getUserId()));
+            return Result.success(favoritesDao.listByUserId(dto.getUserId()));
         } catch (Exception e) {
             logger.error("获取收藏册列表失败，原因：" + e.getMessage(), e);
             return Result.failed(-1, "获取收藏册列表失败");
@@ -87,7 +87,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     public Result add(FavoritesRequestDto dto) {
         try {
             // 判断收藏册标题是否已存在
-            if (favoritesManager.isExisted(null, dto.getUserId(), dto.getTitle())) {
+            if (favoritesDao.isExisted(null, dto.getUserId(), dto.getTitle())) {
                 return Result.failed(-1, "收藏册的标题不能重复");
             }
 
@@ -101,7 +101,7 @@ public class FavoritesServiceImpl implements FavoritesService {
             favorites.setUpdateTime(date);
             favorites.setDeleted(false);
             favorites.setSort(0);
-            favoritesManager.insert(favorites);
+            favoritesDao.insert(favorites);
             return Result.success();
         } catch (Exception e) {
             logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
@@ -114,12 +114,12 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result update(FavoritesRequestDto dto) {
         try {
-            Favorites favorites = favoritesManager.info(dto.getId());
+            Favorites favorites = favoritesDao.info(dto.getId());
             if (Objects.isNull(favorites)) {
                 return Result.failed("数据异常，记录不存在");
             }
             // 判断收藏册标题是否已存在
-            if (favoritesManager.isExisted(dto.getId(), dto.getUserId(), dto.getTitle())) {
+            if (favoritesDao.isExisted(dto.getId(), dto.getUserId(), dto.getTitle())) {
                 return Result.failed("收藏册的标题不能重复");
             }
 
@@ -127,7 +127,7 @@ public class FavoritesServiceImpl implements FavoritesService {
             favorites.setDescription(dto.getDescription());
             favorites.setImages(dto.getImages());
             favorites.setUpdateTime(new Date());
-            favoritesManager.update(favorites);
+            favoritesDao.update(favorites);
             return Result.success();
         } catch (Exception e) {
             logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
@@ -139,7 +139,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result info(FavoritesRequestDto dto) {
         try {
-            Favorites favorites = favoritesManager.info(dto.getId());
+            Favorites favorites = favoritesDao.info(dto.getId());
             if (Objects.isNull(favorites)) {
                 return Result.failed("数据异常，记录不存在");
             }
@@ -154,13 +154,13 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result delete(FavoritesRequestDto dto) {
         try {
-            List<FavoritesItemsRelation> favoritesItemsList = favoritesItemsRelationManager.listByFavoritesId(dto.getId(), null);
+            List<FavoritesItemsRelation> favoritesItemsList = favoritesItemsRelationDao.listByFavoritesId(dto.getId(), null);
             if (CollectionUtils.isNotEmpty(favoritesItemsList)) {
                 return Result.failed("收藏册内有藏品，请先移除藏品");
             }
 
             // 删除收藏册
-            favoritesManager.delete(dto.getId(), null);
+            favoritesDao.delete(dto.getId(), null);
             return Result.success();
         } catch (Exception e) {
             logger.error("删除收藏册失败，原因：" + e.getMessage(), e);
@@ -174,11 +174,11 @@ public class FavoritesServiceImpl implements FavoritesService {
     public Result batchDelete(FavoritesRequestDto dto) {
         try {
             // 批量删除收藏册下用户创建的钱币
-            List<FavoritesItemsRelation> list = favoritesItemsRelationManager.listByFavoritesId(null, dto.getIds());
+            List<FavoritesItemsRelation> list = favoritesItemsRelationDao.listByFavoritesId(null, dto.getIds());
             if (CollectionUtils.isNotEmpty(list)) {
                 List<Long> favoritesItemsIds = list.stream()
                         .map(FavoritesItemsRelation::getItemId).collect(Collectors.toList());
-                List<UserItemsRelation> usersItemsList = userItemsRelationManager.listByUserIds(dto.getUserId(), null);
+                List<UserItemsRelation> usersItemsList = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
                 if (CollectionUtils.isNotEmpty(usersItemsList)) {
                     List<Long> usersItemsIds = usersItemsList.stream()
                             .map(UserItemsRelation::getItemId).collect(Collectors.toList());
@@ -191,10 +191,10 @@ public class FavoritesServiceImpl implements FavoritesService {
             }
 
             // 删除收藏册和钱币的关联
-            favoritesItemsRelationManager.deleteByFavoritesId(null, dto.getIds());
+            favoritesItemsRelationDao.deleteByFavoritesId(null, dto.getIds());
 
             // 删除收藏册
-            favoritesManager.delete(null, dto.getIds());
+            favoritesDao.delete(null, dto.getIds());
             return Result.success();
         } catch (Exception e) {
             logger.error("批量删除收藏册失败，原因：" + e.getMessage(), e);
@@ -208,7 +208,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     public Result removeItem(ItemRequestDto dto) {
         try {
             // 批量删除收藏册下用户创建的钱币
-            List<UserItemsRelation> usersItemsList = userItemsRelationManager.listByUserIds(dto.getUserId(), null);
+            List<UserItemsRelation> usersItemsList = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
             if (CollectionUtils.isNotEmpty(usersItemsList)) {
                 List<Long> usersItemsIds = usersItemsList.stream()
                         .map(UserItemsRelation::getItemId).collect(Collectors.toList());
@@ -220,7 +220,7 @@ public class FavoritesServiceImpl implements FavoritesService {
             }
 
             // 删除收藏册和钱币的关联
-            favoritesItemsRelationManager.deleteByChosen(dto.getFavoritesId(), dto.getItemIds());
+            favoritesItemsRelationDao.deleteByChosen(dto.getFavoritesId(), dto.getItemIds());
             return Result.success();
         } catch (Exception e) {
             logger.info("收藏册取消收藏失败，原因：" + e.getMessage(), e);
@@ -234,7 +234,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     public Result moveItem(ItemRequestDto dto) {
         try {
             // 删除原收藏册和藏品关联记录
-            favoritesItemsRelationManager.deleteByChosen(dto.getBeforeFavoritesId(), dto.getItemIds());
+            favoritesItemsRelationDao.deleteByChosen(dto.getBeforeFavoritesId(), dto.getItemIds());
 
             // 新增新收藏册和藏品关联记录
             Date now = new Date();
@@ -247,7 +247,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                 list.add(record);
             }
             if (CollectionUtils.isNotEmpty(list)) {
-                favoritesItemsRelationManager.batchInsert(list);
+                favoritesItemsRelationDao.batchInsert(list);
             }
             return Result.success();
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/ItemServiceImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

-package com.wwdz.ch.wx.service.impl;
+package com.wwdz.ch.wx.impl;
 
 import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.type.Result;
@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -35,6 +37,17 @@ public class ItemServiceImpl implements ItemService {
     @Autowired
     private CategoryManager categoryManager;
 
+
+    @Override
+    public Result page(ItemRequestDto dto) {
+        return null;
+    }
+
+    @Override
+    public Result list(ItemRequestDto dto) {
+        return null;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result add(ItemRequestDto dto) {
@@ -115,8 +128,49 @@ public class ItemServiceImpl implements ItemService {
             if (null == item.getId()) {
                 return Result.failed("数据异常，该藏品不存在");
             }
+            item.setName(dto.getName());
+            item.setCid(dto.getCid());
+            item.setImages(dto.getImages());
+            item.setPrice(Long.parseLong(dto.getPrice()) * 100);
+            item.setDetail(dto.getDetail());
+            Date now = new Date();
+            item.setUpdateTime(now);
+            item.setSourceType(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode());
+            item.setIsDeleted(false);
+            itemManager.update(item);
 
+            // 删除藏品和原收藏册关联
+            List<Long> itemIds = new ArrayList<>();
+            itemIds.add(item.getId());
+            favoritesItemsRelationManager.deleteByChosen(dto.getBeforeFavoritesId(), itemIds);
 
+            // 新增藏品和新收藏册关联
+            FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
+            favoritesItemsRelation.setUserId(dto.getUserId());
+            favoritesItemsRelation.setFavoritesId(dto.getAfterFavoritesId());
+            favoritesItemsRelation.setItemId(item.getId());
+            favoritesItemsRelationManager.insert(favoritesItemsRelation);
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("修改藏品失败，原因：" + e.getMessage(), e);
+            return Result.failed("修改藏品失败");
+        }
+    }
+
+    @Override
+    public Result update(ItemRequestDto dto) {
+        try {
+            Item item = itemManager.findDetails(dto.getId());
+            if (null == item.getId()) {
+                return Result.failed("数据异常，该藏品不存在");
+            }
+
+            // 新增藏品和收藏册关联
+            FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
+            favoritesItemsRelation.setUserId(dto.getUserId());
+            favoritesItemsRelation.setFavoritesId(dto.getFavoritesId());
+            favoritesItemsRelation.setItemId(item.getId());
+            favoritesItemsRelationManager.insert(favoritesItemsRelation);
             return Result.success();
         } catch (Exception e) {
             logger.error("收藏藏品失败，原因：" + e.getMessage(), e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ItemService.java

@@ -4,9 +4,15 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 
 public interface ItemService {
+    Result page(ItemRequestDto dto);
+
+    Result list(ItemRequestDto dto);
+
     Result add(ItemRequestDto dto);
 
     Result info(ItemRequestDto dto);
 
     Result collect(ItemRequestDto dto);
+
+    Result update(ItemRequestDto dto);
 }