albertshaw 8 years ago
parent
commit
5c29a21cbc

+ 3 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -318,6 +318,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		c.setRecordTime(now.getTime());
+		c.setCreateTime(now.getTime());
 		orgCognizanceMapper.insert(c);
 		return c;
 	}
@@ -457,7 +458,8 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		oc.setRecordTime(now.getTime());
-
+		oc.setCreateTime(now.getTime());
+		
 		OrgCognizanceLog ocl = new OrgCognizanceLog();
 		ocl.setId(UUID.randomUUID().toString());
 		ocl.setCid(oc.getId());

+ 15 - 16
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -8,30 +8,29 @@ import com.goafanti.memberGrade.bo.MemberGrade;
 
 public interface MemberGradeMapper {
 	List<MemberGrade> selectMemberGrade();
-	
-	int delGrade(int id); 
-	
+
+	int delGrade(int id);
+
 	int selectRank(MemberGrade me);
+
 	int addGradeName(MemberGrade me);
-	
+
 	int addBusinessAndCost(MemberGrade me);
-	
+
 	List<MemberOrder> selectMemberOrder(Map<String, Object> map);
-	
+
 	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
-	
+
 	int countMemberOrder(String userId);
-	
+
 	int addBasicsMemberOrder(MemberOrder mo);
-	
+
 	int countMemberOrderWhere(Map<String, Object> map);
-		
+
 	int updateMemberOrder(Map<String, Object> map);
-	
+
+	int delMemberOrder(Map<String, Object> map);
+
 	int updateUserLvl(Map<String, Object> map);
-	
-	
-	
-	
-	
+
 }

+ 53 - 0
src/main/java/com/goafanti/common/enums/OrderState.java

@@ -0,0 +1,53 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum OrderState {
+	UNPAYED(0, "未支付"), PAYED(1, "已支付");
+
+	private OrderState(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, OrderState> status = new HashMap<Integer, OrderState>();
+
+	static {
+		for (OrderState value : OrderState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static OrderState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return null;
+	}
+
+	public static OrderState getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return null;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -42,7 +42,6 @@
 		WHERE id=#{id}
 	</delete>
 
-
 	<!-- 新增会员等级是否存在 -->
 	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
 		resultType="int">
@@ -73,8 +72,8 @@
 		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.member_rank=mo.menber_Type
-		WHERE user_id=#{id}
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_type
+		WHERE user_id=#{id} and mo.order_state &lt; 9
 		LIMIT #{pNos},#{pSize}
 	</select>
 
@@ -91,12 +90,13 @@
 		LEFT JOIN user u ON
 		u.id=mo.user_id
 		WHERE 1=1
-		<if test="id!=null">AND mo.id=#{id}</if>
+		<if test="id!=null">AND mo.id = #{id}</if>
 		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
 		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-		<if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
+		<if test="orderState!=null">AND order_state = #{orderState}</if>
+		<if test="orderState==null">AND order_state &lt; 9</if>
 		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-		<if test="endTimes!=null">AND order_time&lt;#{endTimes}</if>
+		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
 		LIMIT #{pNos},#{pSize}
 	</select>
 
@@ -105,14 +105,13 @@
 	<select id="countMemberOrderWhere" parameterType="java.util.Map"
 		resultType="int">
 		SELECT COUNT(*) FROM member_order mo
-		LEFT JOIN member_grade mg ON
-		mg.id=mo.menber_Type
 		LEFT JOIN user u ON u.id=mo.user_id
 		WHERE 1=1
-		<if test="id!=null">AND mo.id LIKE CONCAT('%',#{id},'%')</if>
+		<if test="id!=null">AND mo.id = #{id}</if>
 		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
 		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-		<if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
+		<if test="orderState!=null">AND order_state = #{orderState}</if>
+		<if test="orderState==null">AND order_state &lt; 9</if>
 		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
 		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
 	</select>
@@ -127,7 +126,7 @@
 	<select id="countMemberOrder" parameterType="String"  resultType="int">
 		SELECT COUNT(*) FROM
 		member_order
-		WHERE  user_id=#{userId}
+		WHERE  user_id=#{userId} and order_state &lt; 9
 	</select>
 
 	<!-- 后台订单更改 -->
@@ -142,17 +141,17 @@
 		payment_id=#{paymentId} 
 		WHERE id=#{id}
 	</update>
+	
+	<!-- 后台订单软删除 -->
+	<update id="delMemberOrder">
+		UPDATE member_order SET order_state=9 
+		WHERE id=#{id} and order_state = 0
+		<if test="uid!=null">AND user_id = #{uid}</if>
+	</update>
 
 	<!-- 更改用户会员等级 -->
 	<update id="updateUserLvl" parameterType="java.util.Map">
 		UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
 	</update>
 	
-	
-	
-	
-
-
-
-
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/mapper/UserInterestMapper.xml

@@ -113,8 +113,14 @@
 	LEFT JOIN achievement_demand_count adc ON adc.uid = ui.to_uid
 	WHERE
 		ui.from_uid = #{fromUid,jdbcType=VARCHAR}
+		<if test="userType != null" >
+        u.type = #{userType}
+      	</if>
 	ORDER BY
 		ui.create_time DESC
+	<if test="page_sql!=null">
+			${page_sql}
+	</if>
   </select>
   
   <select id="findInterestUserCount" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -122,8 +128,12 @@
 	  count(1)
     FROM
 	 user_interest ui
+	 LEFT JOIN `user` u ON u.id = ui.to_uid
     WHERE
 	 ui.from_uid = #{fromUid,jdbcType=VARCHAR}
+	 <if test="userType != null" >
+       u.type = #{userType}
+   	 </if>
   </select>
   
   <select id="countByToUid" parameterType="java.lang.String" resultType="java.lang.Integer">

+ 12 - 1
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -154,7 +154,18 @@ public class MemberGradeController extends BaseApiController {
 		map.put("paymentTime", paymentTime);
 		map.put("paymentType", paymentType);
 		map.put("paymentId", paymentId);
-		return res().data(memberGradeService.updateMemberOrder(map, umap));
+		memberGradeService.updateMemberOrder(map, umap);
+		return res().data(1);
+	}
+
+	/**
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/delMemberOrder", method = RequestMethod.POST)
+	public Result delMemberOrder(Long id) {
+		return res().data(memberGradeService.delMemberOrder(id));
 	}
 
 }

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.enums.OrderState;
 import com.goafanti.common.model.MemberOrder;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -70,11 +71,22 @@ public class MemberGradeFrontController extends BaseApiController {
 		mo.setMenberType(menberType);
 		mo.setPrice(Double.valueOf(price));
 		mo.setValidMonth(validMonth);
-		mo.setOrderState(0);
+		mo.setOrderState(OrderState.UNPAYED.getCode());
 		mo.setOrderTime(new Date());
 		Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
 		mo.setUserId(TokenManager.getUserId());
 		return res().data(memberGradeService.addBasicsMemberOrder(mo));
 	}
+	
+
+	/**
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/delMemberOrder", method = RequestMethod.POST)
+	public Result delMemberOrder(Long id) {
+		return res().data(memberGradeService.delMemberOrder(id));
+	}
 
 }

+ 18 - 11
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -1,5 +1,6 @@
 package com.goafanti.memberGrade.service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -7,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.MemberGradeMapper;
+import com.goafanti.common.enums.OrderState;
 import com.goafanti.common.model.MemberOrder;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.memberGrade.bo.MemberGrade;
 
 @Service
@@ -54,17 +57,21 @@ public class MemberGradeService {
 	public int countMemberOrderWhere(Map<String, Object> map) {
 		return memberGradeMapper.countMemberOrderWhere(map);
 	}
-	
-	
-	public int updateMemberOrder(Map<String, Object> map,Map<String, Object> umap){
-		int i=memberGradeMapper.updateMemberOrder(map);
-		int j=memberGradeMapper.updateUserLvl(umap);
-		return i+j;
+
+	public void updateMemberOrder(Map<String, Object> map, Map<String, Object> umap) {
+		memberGradeMapper.updateMemberOrder(map);
+		if (OrderState.getStatus((Integer) map.get("orderState")) == OrderState.PAYED) {
+			memberGradeMapper.updateUserLvl(umap);
+		}
+	}
+
+	public int delMemberOrder(Long id) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("id", id);
+		if (TokenManager.getAdminToken() == null) {
+			map.put("uid", TokenManager.getUserId());
+		}
+		return memberGradeMapper.delMemberOrder(map);
 	}
-	
-	
-	
-	
-	
 
 }

+ 15 - 14
src/main/java/com/goafanti/user/controller/UserInterestApiController.java

@@ -1,6 +1,5 @@
 package com.goafanti.user.controller;
 
-
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
@@ -11,21 +10,22 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.service.UserInterestService;
 
 @RestController
 @RequestMapping(value = "/api/user/interest")
-public class UserInterestApiController extends CertifyApiController{
+public class UserInterestApiController extends CertifyApiController {
 	@Resource
 	private UserInterestService userInterestService;
-	
+
 	/**
 	 * 关注用户列表
 	 */
 	@RequestMapping(value = "/interestUserList", method = RequestMethod.GET)
-	public Result interestUserList(String pageNo, String pageSize){
+	public Result interestUserList(String pageNo, String pageSize, String type) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -35,42 +35,43 @@ public class UserInterestApiController extends CertifyApiController{
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(userInterestService.listInterestUser(pNo, pSize));
+		Integer userType = StringUtils.isBlank(type) ? null : UserType.getStatus(type).getCode();
+		res.setData(userInterestService.listInterestUser(pNo, pSize, userType));
 		return res;
 	}
-	
+
 	/**
 	 * 关注用户
 	 */
 	@RequestMapping(value = "/interestUser", method = RequestMethod.POST)
-	public Result interestUser(String toUid){
+	public Result interestUser(String toUid) {
 		Result res = new Result();
-		if (StringUtils.isBlank(toUid)){
+		if (StringUtils.isBlank(toUid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "被关注用户ID"));
 			return res;
 		}
 		UserInterest ui = userInterestService.findByFromUidAndToUid(TokenManager.getUserId(), toUid);
-		if (null != ui){
+		if (null != ui) {
 			res.getError().add(buildError("", "当前用户已关注!"));
 			return res;
 		}
-		
+
 		res.setData(userInterestService.insert(toUid));
 		return res;
 	}
-	
+
 	/**
 	 * 取消关注
 	 */
 	@RequestMapping(value = "/cancelInterest", method = RequestMethod.POST)
-	public Result cancelInterest(String interestId){
+	public Result cancelInterest(String interestId) {
 		Result res = new Result();
-		if (StringUtils.isBlank(interestId)){
+		if (StringUtils.isBlank(interestId)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "关注ID"));
 			return res;
 		}
 		UserInterest ui = userInterestService.findByPrimaryKey(interestId);
-		if (null == ui || !TokenManager.getUserId().equals(ui.getFromUid())){
+		if (null == ui || !TokenManager.getUserId().equals(ui.getFromUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关注ID"));
 			return res;
 		}

+ 1 - 1
src/main/java/com/goafanti/user/service/UserInterestService.java

@@ -14,7 +14,7 @@ public interface UserInterestService {
 
 	int deleteByPrimaryKey(String interestId);
 
-	Pagination<InterestUserListBo> listInterestUser(Integer pNo, Integer pSize);
+	Pagination<InterestUserListBo> listInterestUser(Integer pNo, Integer pSize, Integer userType);
 
 	Integer countByToUid(String uid);
 

+ 9 - 3
src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.InterestUserListBo;
 import com.goafanti.user.service.UserInterestService;
+
 @Service
 public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper> implements UserInterestService {
 	@Autowired
@@ -50,7 +51,7 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<InterestUserListBo> listInterestUser(Integer pageNo, Integer pageSize) {
+	public Pagination<InterestUserListBo> listInterestUser(Integer pageNo, Integer pageSize, Integer userType) {
 		Map<String, Object> params = new HashMap<>();
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
@@ -59,9 +60,14 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 		if (pageSize == null || pageSize < 0 || pageSize > 10) {
 			pageSize = 10;
 		}
+
+		if (userType != null) {
+			params.put("userType", userType);
+		}
+
 		params.put("fromUid", TokenManager.getUserId());
-		return (Pagination<InterestUserListBo>) findPage("findInterestUserListByPage",
-				"findInterestUserCount", params, pageNo, pageSize);
+		return (Pagination<InterestUserListBo>) findPage("findInterestUserListByPage", "findInterestUserCount", params,
+				pageNo, pageSize);
 	}
 
 	@Override