Browse Source

Merge branch 'test' of http://git.jishutao.com/jishutao/aft.git into test

Administrator 7 years ago
parent
commit
0214e99bc5

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -107,4 +107,6 @@ public class AFTConstants {
 	public static final String	MONTHLY								= "monthly";
 	public static final String	QUARTERLY							= "quarterly";
 	public static final String	ANNUALLY							= "annually";
+
+	public static final Integer USER_STATUS = 1;
 }

+ 2 - 0
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -745,6 +745,7 @@
 			commodity_type,
 			commodity_quantity,
 			task_status,
+			task_comment,
 			create_time
 		)
 	values
@@ -758,6 +759,7 @@
 		#{item.commodityType,jdbcType=INTEGER},
 		#{item.commodityQuantity,jdbcType=INTEGER},
 		#{item.taskStatus,jdbcType=INTEGER},
+		#{item.taskComment,jdbcType=VARCHAR},
 		#{item.createTime,jdbcType=TIMESTAMP}
 	  )
     </foreach>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -177,7 +177,7 @@
       society_tag, introduction, last_member_order_id, 
       current_member_status, value_added_tag, organization_id, 
       share_type, identify_name, is_member, 
-      business_audit)
+      business_audit,audit_status)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=BIGINT}, #{lvl,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
@@ -186,7 +186,7 @@
       #{societyTag,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{lastMemberOrderId,jdbcType=VARCHAR}, 
       #{currentMemberStatus,jdbcType=INTEGER}, #{valueAddedTag,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, 
       #{shareType,jdbcType=INTEGER}, #{identifyName,jdbcType=VARCHAR}, #{isMember,jdbcType=INTEGER}, 
-      #{businessAudit,jdbcType=INTEGER})
+      #{businessAudit,jdbcType=INTEGER},#{auditStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.User">
     <!--

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1293,7 +1293,7 @@
       	nickname = #{nickname,jdbcType=VARCHAR},
       	mobile = #{mobile,jdbcType=VARCHAR},
       	society_tag = #{societyTag,jdbcType=VARCHAR},
-      	audit_status=0
+      	audit_status=1
     	where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

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

@@ -230,6 +230,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setUpdateTime(now);
 		user.setMobile(contactMobile);
 		user.setPassword(AFTConstants.INITIALPASSWORD);
+		user.setAuditStatus(AFTConstants.USER_STATUS);
 		user.setIsMember(AFTConstants.NO);
 		user.setBusinessAudit(AFTConstants.NO);
 		passwordUtil.encryptPassword(user);

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.ContractMapper;
+import com.goafanti.common.dao.ContractTaskMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBillMapper;
@@ -94,6 +95,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private OrganizationManagementMapper organizationManagementMapper;
 	@Autowired
 	private ContractMapper contractMapper;
+	@Autowired 
+	private ContractTaskMapper contractTaskMapper;
 	@Autowired
 	private TOrderChangeMapper tOrderChangeMapper;
 	@Autowired