Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

yee 8 years ago
parent
commit
701a84182b

+ 18 - 8
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -6,7 +6,7 @@
 	<resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
 		<id column="id" property="id" />
 		<result column="menber_type" property="menberType" />
-		<result column="gradeName" property="gradeName" />
+		<result column="grade_name" property="gradeName" />
 		<result column="price" property="price" />
 		<result column="valid_month" property="validMonth" />
 		<result column="order_state" property="orderState" />
@@ -20,8 +20,18 @@
 	</resultMap>
 
 
+	<resultMap id="memberGradeMap" type="com.goafanti.memberGrade.bo.MemberGrade">
+		<id column="id" property="id" />
+		<result column="grade_name" property="gradeName" />
+		<result column="business" property="business" />
+		<result column="cost" property="cost" />
+		<result column="member_rank" property="memberRank" />
+	</resultMap>
+
+
+
 	<!-- 查询所有 -->
-	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
+	<select id="selectMemberGrade" resultMap="memberGradeMap">
 		SELECT * FROM
 		member_grade;
 	</select>
@@ -37,7 +47,7 @@
 	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
 		resultType="int">
 		SELECT COUNT(*) FROM member_grade WHERE
-		memberRank=#{memberRank}
+		member_rank=#{memberRank}
 	</select>
 
 
@@ -45,7 +55,7 @@
 	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
 		useGeneratedKeys="true" keyProperty="id">
 		INSERT INTO
-		member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
+		member_grade(grade_name,member_rank) VALUES (#{gradeName},#{memberRank})
 	</insert>
 
 
@@ -59,11 +69,11 @@
 	<!-- 前台会员订单查询 -->
 	<select id="selectMemberOrder" parameterType="java.util.Map"
 		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type , mg.gradeName, price,
+		SELECT mo.id,menber_type , mg.grade_name, price,
 		valid_month,order_state ,order_time ,user_id ,
 		payment_time,payment_value,payment_type ,payment_id ,valid_time
 		FROM member_order mo
-		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_Type
 		WHERE user_id=#{id}
 		LIMIT #{pNos},#{pSize}
 	</select>
@@ -72,12 +82,12 @@
 	<!-- 后台会员订单查询 -->
 	<select id="selectMemberOrderBa" parameterType="java.util.Map"
 		resultMap="memberOrderMap">
-		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price,
+		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.grade_name, price,
 		valid_month,order_state ,order_time ,user_id ,
 		payment_time
 		,payment_value,payment_type ,payment_id ,valid_time FROM member_order
 		mo
-		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_Type
 		LEFT JOIN user u ON
 		u.id=mo.user_id
 		WHERE 1=1

+ 4 - 4
src/main/java/com/goafanti/common/mapper/MyAppMapper.xml

@@ -24,13 +24,13 @@
   <select id="countMyTech" parameterType="String" resultType="org.springframework.ui.ModelMap">
   	select 
 	(select count(1) from achievement a left join achievement_demand ad on a.id=ad.achievement_id where ad.demand_id is not null and a.owner_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status>5 and (ao.service_money>0 or ao.commission>0 or ao.intention_money>0)) as `deal`,
-	(select count(1) from achievement a left join achievement_interest ai on a.id=ai.achievement_id where ai.id is not null and a.owner_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status  <![CDATA[ > ]]>  5 and (ao.service_money  <![CDATA[ > ]]> 0 or ao.commission <![CDATA[ > ]]> 0 or ao.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+	(select count(1) from achievement a left join achievement_order iao on a.id=iao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and iao.status  <![CDATA[ < ]]> 6) as `intention`
   </select>
   <select id="countMyDemand" parameterType="String" resultType="org.springframework.ui.ModelMap">
 	select 
 	(select count(1) from demand d left join achievement_demand ad on d.id=ad.demand_id where ad.demand_id is not null and d.employer_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status>5 and (`do`.service_money>0 or `do`.commission>0 or `do`.intention_money>0)) as `deal`,
-	(select count(1) from demand d left join demand_interest di on d.id=di.demand_id where di.id is not null and d.employer_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status <![CDATA[ > ]]> 5 and (`do`.service_money <![CDATA[ > ]]> 0 or `do`.commission <![CDATA[ > ]]> 0 or `do`.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+	(select count(1) from demand d left join demand_order `ido` on d.id=`ido`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `ido`.status <![CDATA[ < ]]> 6) as `intention`
   </select>
 </mapper>

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

@@ -24,6 +24,7 @@
     <result column="type" jdbcType="INTEGER" property="type"/>
     <result column="person_portrait_url" jdbcType="VARCHAR" property="personPortraitUrl"/>
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl"/>
+    <result column="grade_name" jdbcType="VARCHAR" property="gradeName"/>
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserDownLoadBo" id="UserDownLoadBo">
@@ -194,7 +195,7 @@
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
    select 
-   		u.lvl, u.nickname, u.email,
+   		u.lvl, mg.grade_name , u.nickname, u.email,
    		u.number, u.type, i.person_portrait_url, 
    		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
@@ -202,6 +203,7 @@
    LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid 
    LEFT JOIN achievement_demand_count adc on adc.uid = u.id
+   LEFT JOIN   member_grade mg ON mg.member_rank=u.lvl
    where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   

+ 10 - 16
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -19,7 +19,6 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
@@ -101,14 +100,8 @@ public class MemberGradeController extends BaseApiController {
 	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
 	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
 			Integer orderState, String startTime, String endTime) {
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
+		Integer pNo=getPageNo(pageNo);
+		Integer pSize=getPageSize(pageSize);
 		Integer pNos = (pNo - 1) * pSize;
 		Map<String, Object> map = new HashMap<>();
 		map.put("pNos", pNos);
@@ -118,16 +111,17 @@ public class MemberGradeController extends BaseApiController {
 		map.put("nickname", nickname);
 		map.put("orderState", orderState);
 		map.put("startTimes", startTime);
-		try {
-			map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
-		} catch (ParseException e) {
-			LoggerUtils.error(this.getClass(), "ffff", e);
+		if(endTime!=null){
+			try {
+				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
+			} catch (ParseException e) {
+				LoggerUtils.error(this.getClass(), "ffff", e);
+			}
 		}
-
 		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
 		int countWhere = memberGradeService.countMemberOrderWhere(map);
 		Map<String, Object> maps = new HashMap<>();
-		maps.put("List", list);
+		maps.put("list", list);
 		maps.put("countWhere", countWhere);
 		maps.put("pNo", pNo);
 		return res().data(maps);
@@ -145,7 +139,7 @@ public class MemberGradeController extends BaseApiController {
 	 * @param paymentType
 	 * @return
 	 */
-	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
+	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
 	public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
 			Integer orderState, String paymentTime, String paymentType,String userId) {
 		Map<String, Object> umap = new HashMap<>();

+ 2 - 2
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -53,10 +53,10 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
-		List<MemberOrder> lsit = memberGradeService.selectMemberOrder(map);
+		List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
 		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
 		Map<String, Object> maps = new HashMap<>();
-		maps.put("lsit", lsit);
+		maps.put("list", list);
 		maps.put("count", count);
 		maps.put("pNo", pNo);
 		return res().data(maps);

+ 12 - 0
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -67,6 +67,18 @@ public class UserPageHomeBo {
 	 */
 	private Integer	intellectualPropertyNum;
 
+	//会员名称
+	private String gradeName;
+	
+	public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
+
+	
 	public String getUid() {
 		return uid;
 	}