Pārlūkot izejas kodu

版本切换1.2.69

anderx 2 gadi atpakaļ
vecāks
revīzija
db519b7c70

+ 6 - 20
src/main/java/com/goafanti/common/mapper/UserMidMapper.xml

@@ -27,13 +27,12 @@
     <result column="follow_explain" jdbcType="VARCHAR" property="followExplain" />
     <result column="follow_aname" jdbcType="VARCHAR" property="followAname" />
     <result column="follow_aid" jdbcType="VARCHAR" property="followAid" />
-    <result column="aname" jdbcType="VARCHAR" property="aname" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, last_follow_time, last_sign_time, create_time, big_customer, update_aid,
     update_name, date_update_time, channel_type, chargeback, `member`, last_sales_type,
     last_follow_type, follow_number, task_names, sign_number, sign_amount, last_signing_time,
-    first_signing_time, follow_dep, follow_explain, follow_aname, follow_aid, aname
+    first_signing_time, follow_dep, follow_explain, follow_aname, follow_aid
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -53,8 +52,8 @@
       last_sales_type, last_follow_type, follow_number,
       task_names, sign_number, sign_amount,
       last_signing_time, first_signing_time, follow_dep,
-      follow_explain, follow_aname, follow_aid,
-      aname)
+      follow_explain, follow_aname, follow_aid
+      )
     values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{lastFollowTime,jdbcType=TIMESTAMP},
       #{lastSignTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{bigCustomer,jdbcType=INTEGER},
       #{updateAid,jdbcType=VARCHAR}, #{updateName,jdbcType=VARCHAR}, #{dateUpdateTime,jdbcType=TIMESTAMP},
@@ -62,8 +61,8 @@
       #{lastSalesType,jdbcType=INTEGER}, #{lastFollowType,jdbcType=INTEGER}, #{followNumber,jdbcType=INTEGER},
       #{taskNames,jdbcType=VARCHAR}, #{signNumber,jdbcType=INTEGER}, #{signAmount,jdbcType=DECIMAL},
       #{lastSigningTime,jdbcType=DATE}, #{firstSigningTime,jdbcType=DATE}, #{followDep,jdbcType=VARCHAR},
-      #{followExplain,jdbcType=VARCHAR}, #{followAname,jdbcType=VARCHAR}, #{followAid,jdbcType=VARCHAR},
-      #{aname,jdbcType=VARCHAR})
+      #{followExplain,jdbcType=VARCHAR}, #{followAname,jdbcType=VARCHAR}, #{followAid,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserMid" useGeneratedKeys="true">
     insert into user_mid
@@ -140,9 +139,6 @@
       <if test="followAid != null">
         follow_aid,
       </if>
-      <if test="aname != null">
-        aname,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="uid != null">
@@ -217,9 +213,6 @@
       <if test="followAid != null">
         #{followAid,jdbcType=VARCHAR},
       </if>
-      <if test="aname != null">
-        #{aname,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserMid">
@@ -297,9 +290,6 @@
       <if test="followAid != null">
         follow_aid = #{followAid,jdbcType=VARCHAR},
       </if>
-      <if test="aname != null">
-        aname = #{aname,jdbcType=VARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -328,8 +318,7 @@
       follow_dep = #{followDep,jdbcType=VARCHAR},
       follow_explain = #{followExplain,jdbcType=VARCHAR},
       follow_aname = #{followAname,jdbcType=VARCHAR},
-      follow_aid = #{followAid,jdbcType=VARCHAR},
-      aname = #{aname,jdbcType=VARCHAR}
+      follow_aid = #{followAid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -406,9 +395,6 @@
       <if test="followAid != null">
         follow_aid = #{followAid,jdbcType=VARCHAR},
       </if>
-      <if test="aname != null">
-        aname = #{aname,jdbcType=VARCHAR},
-      </if>
     </set>
     where `uid` = #{uid,jdbcType=VARCHAR}
   </update>

+ 0 - 13
src/main/java/com/goafanti/common/model/UserMid.java

@@ -134,11 +134,6 @@ public class UserMid implements Serializable {
      */
     private String followAid;
 
-    /**
-     * 管理员名称
-     */
-    private String aname;
-
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -340,12 +335,4 @@ public class UserMid implements Serializable {
     public void setFollowAid(String followAid) {
         this.followAid = followAid;
     }
-
-    public String getAname() {
-        return aname;
-    }
-
-    public void setAname(String aname) {
-        this.aname = aname;
-    }
 }

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

@@ -390,7 +390,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			UserMid um=new UserMid();
 			um.setAid(user.getAid());
 			um.setUid(uid);
-			um.setAname(aname);
 			um.setChannelType(in.getChannelType());
 			userMidMapper.insertSelective(um);
 			// 创建企业认证信息
@@ -579,7 +578,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		int i=userMidMapper.updateByUid(um);
 		if (i==0) {
 			um.setAid(aid);
-			um.setAname(a.getName());
 			userMidMapper.insertSelective(um);
 		}
 		StringBuffer str=new StringBuffer(a.getName()).append("修改了主营产品");
@@ -883,8 +881,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		um.setLastFollowTime(date);
 		int x=userMidMapper.updateByUid(um);
 		if (x==0){
-			Admin admin = adminMapper.selectByPrimaryKey(aid);
-			um.setAname(admin.getName());
 			userMidMapper.insertSelective(um);
 		}
 	}

+ 0 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -615,8 +615,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			int x=userMidMapper.updateByUid(um);
 			if (x==0) {
 				um.setAid(t.getSalesmanId());
-				Admin salesman = adminMapper.selectByPrimaryKey(t.getSalesmanId());
-				um.setAname(salesman.getName());
 				userMidMapper.insertSelective(um);
 			}
 		}