Browse Source

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

Conflicts:
	src/main/java/com/goafanti/common/controller/PortalController.java
	src/main/java/com/goafanti/common/controller/WebpageController.java
	src/main/java/com/goafanti/common/dao/MemberGradeMapper.java
	src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml
	src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
	src/main/java/com/goafanti/common/mapper/UserMapper.xml
	src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
	src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java
	src/main/java/com/goafanti/news/bo/NewsPortalList.java
	src/main/java/com/goafanti/news/controller/NewsController.java
	src/main/java/com/goafanti/news/service/NewsService.java
	src/main/webapp/WEB-INF/views/common.html
wanghui 8 years ago
parent
commit
394fab6bb5
30 changed files with 693 additions and 1198 deletions
  1. 6 6
      schema/20170829-member_grade.sql
  2. 13 0
      schema/20170913-consult-order.sql
  3. 8 9
      src/main/java/com/goafanti/app/controller/AppApiController.java
  4. 3 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  5. 2 2
      src/main/java/com/goafanti/common/controller/PortalController.java
  6. 8 2
      src/main/java/com/goafanti/common/controller/WebpageController.java
  7. 17 0
      src/main/java/com/goafanti/common/dao/ConsultOrderMapper.java
  8. 2 0
      src/main/java/com/goafanti/common/dao/MemberGradeMapper.java
  9. 53 0
      src/main/java/com/goafanti/common/enums/OrderState.java
  10. 1 1
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  11. 153 0
      src/main/java/com/goafanti/common/mapper/ConsultOrderMapper.xml
  12. 1 4
      src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml
  13. 30 1
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  14. 10 0
      src/main/java/com/goafanti/common/mapper/UserInterestMapper.xml
  15. 1 1009
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  16. 132 0
      src/main/java/com/goafanti/common/model/ConsultOrder.java
  17. 41 28
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
  18. 61 54
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java
  19. 18 11
      src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java
  20. 11 2
      src/main/java/com/goafanti/news/bo/NewsPortalList.java
  21. 24 23
      src/main/java/com/goafanti/news/controller/NewsController.java
  22. 30 20
      src/main/java/com/goafanti/news/service/NewsService.java
  23. 15 14
      src/main/java/com/goafanti/user/controller/UserInterestApiController.java
  24. 1 1
      src/main/java/com/goafanti/user/service/UserInterestService.java
  25. 9 3
      src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java
  26. 2 2
      src/main/resources/props/config_dev.properties
  27. 7 3
      src/main/resources/props/config_prod.properties
  28. 2 2
      src/main/resources/spring/spring-shiro.xml
  29. 16 0
      src/main/webapp/WEB-INF/views/admin/userOrder.html
  30. 16 0
      src/main/webapp/WEB-INF/views/portal/membership.html

+ 6 - 6
schema/20170829-member_grade.sql

@@ -1,9 +1,9 @@
 CREATE TABLE `member_grade` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `gradeName` varchar(50) NOT NULL,
-  `business` longtext COMMENT '业务',
-  `cost` longtext COMMENT '费用',
-  `memberRank` int(11) DEFAULT NULL COMMENT '等级',
+  `grade_name` varchar(50) NOT NULL,
+  `business` longtext,
+  `cost` longtext,
+  `member_rank` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `gradeName_UNIQUE` (`gradeName`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8
+  UNIQUE KEY `gradeName_UNIQUE` (`grade_name`)
+)

+ 13 - 0
schema/20170913-consult-order.sql

@@ -0,0 +1,13 @@
+CREATE TABLE `consult_order` (
+  `id` bigint(19) NOT NULL,
+  `price` double(10,2) NOT NULL COMMENT '价格',
+  `order_state` int(11) NOT NULL COMMENT '付款状态  0:未付款 1:已付款',
+  `order_time` datetime NOT NULL COMMENT '下单时间',
+  `user_id` varchar(36) NOT NULL COMMENT '用户ID 外键',
+  `to_user_id` varchar(36) NOT NULL COMMENT '专家用户ID 外键',
+  `payment_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `payment_value` double(10,2) DEFAULT NULL COMMENT '实际支付金额',
+  `payment_type` varchar(16) DEFAULT NULL COMMENT '支付方式',
+  `payment_id` varchar(45) DEFAULT NULL COMMENT '支付流水号',
+  PRIMARY KEY (`id`)
+)

+ 8 - 9
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -26,15 +26,15 @@ import com.goafanti.news.service.NewsService;
 @RequestMapping(path = "/api/portal/app", method = RequestMethod.GET)
 public class AppApiController extends BaseApiController {
 	@Resource
-	private BannersService			bannersService;
+	private BannersService		bannersService;
 	@Resource
-	private ActivityService	activityService;
+	private ActivityService		activityService;
 	@Resource
-	private NewsService				newsService;
+	private NewsService			newsService;
 	@Resource
-	private AchievementService			achievementService;
+	private AchievementService	achievementService;
 	@Resource
-	private DemandService				demandService;
+	private DemandService		demandService;
 
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public Result index(HttpServletRequest request) {
@@ -42,12 +42,11 @@ public class AppApiController extends BaseApiController {
 		String domainName = request.getServerName();
 		result.put("banners", bannersService.findPortalBanners(BannersType.APP.getKey()));
 		result.put("activities", activityService.findPortalList(0, 3, null));
-		result.put("policies", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3,domainName));
-		result.put("news", newsService.findNewsList(0, NewsType.JTDT.getCode(), 5,domainName));
+		result.put("policies", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, true));
+		result.put("news", newsService.findNewsList(0, NewsType.JTDT.getCode(), 5, domainName, true));
 		return res().data(result);
 	}
-	
-	
+
 	/**
 	 * 科技成果详情
 	 */

+ 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());

+ 2 - 2
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -338,8 +338,8 @@ public class PortalController extends BaseController {
 			reboutiqueachievement.add(boutiqueachievement.get(index + 2));
 		} else {
 			reboutiqueachievement.addAll(boutiqueachievement);
-		};
-		
+		}
+		;
 
 		// 判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
 		boolean isLogin = TokenManager.isLogin();

+ 8 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -294,7 +294,13 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
+	@RequestMapping(value = "/admin/userOrder", method = RequestMethod.GET)
+	public ModelAndView adminUserOrder(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/userOrder");
+		return modelview;
+	}
+
+	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
 	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/technologyTrading/achievement");
 		return modelview;
@@ -553,4 +559,4 @@ public class WebpageController extends BaseController {
 	}
 	
 	
-}
+}

+ 17 - 0
src/main/java/com/goafanti/common/dao/ConsultOrderMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.ConsultOrder;
+
+public interface ConsultOrderMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ConsultOrder record);
+
+    int insertSelective(ConsultOrder record);
+
+    ConsultOrder selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ConsultOrder record);
+
+    int updateByPrimaryKey(ConsultOrder record);
+}

+ 2 - 0
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -25,6 +25,8 @@ public interface MemberGradeMapper {
         
     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;
+	}
+
+}

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

@@ -1433,7 +1433,7 @@
 		user_info c on b.id = c.uid
 	left join 
 		field_glossory d on a.field_a = d.id
-	where 
+	where
 		jmrh_flag = 1 and data_category = 1 and audit_status = 3
 	order by 
 		a.create_time asc

+ 153 - 0
src/main/java/com/goafanti/common/mapper/ConsultOrderMapper.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.ConsultOrderMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.ConsultOrder">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="price" jdbcType="DOUBLE" property="price" />
+    <result column="order_state" jdbcType="INTEGER" property="orderState" />
+    <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="to_user_id" jdbcType="VARCHAR" property="toUserId" />
+    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
+    <result column="payment_value" jdbcType="DOUBLE" property="paymentValue" />
+    <result column="payment_type" jdbcType="VARCHAR" property="paymentType" />
+    <result column="payment_id" jdbcType="VARCHAR" property="paymentId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, price, order_state, order_time, user_id, to_user_id, payment_time, payment_value, 
+    payment_type, payment_id
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from consult_order
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from consult_order
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.ConsultOrder">
+    insert into consult_order (id, price, order_state, 
+      order_time, user_id, to_user_id, 
+      payment_time, payment_value, payment_type, 
+      payment_id)
+    values (#{id,jdbcType=BIGINT}, #{price,jdbcType=DOUBLE}, #{orderState,jdbcType=INTEGER}, 
+      #{orderTime,jdbcType=TIMESTAMP}, #{userId,jdbcType=VARCHAR}, #{toUserId,jdbcType=VARCHAR}, 
+      #{paymentTime,jdbcType=TIMESTAMP}, #{paymentValue,jdbcType=DOUBLE}, #{paymentType,jdbcType=VARCHAR}, 
+      #{paymentId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.ConsultOrder">
+    insert into consult_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="orderState != null">
+        order_state,
+      </if>
+      <if test="orderTime != null">
+        order_time,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="toUserId != null">
+        to_user_id,
+      </if>
+      <if test="paymentTime != null">
+        payment_time,
+      </if>
+      <if test="paymentValue != null">
+        payment_value,
+      </if>
+      <if test="paymentType != null">
+        payment_type,
+      </if>
+      <if test="paymentId != null">
+        payment_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DOUBLE},
+      </if>
+      <if test="orderState != null">
+        #{orderState,jdbcType=INTEGER},
+      </if>
+      <if test="orderTime != null">
+        #{orderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="toUserId != null">
+        #{toUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentValue != null">
+        #{paymentValue,jdbcType=DOUBLE},
+      </if>
+      <if test="paymentType != null">
+        #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentId != null">
+        #{paymentId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ConsultOrder">
+    update consult_order
+    <set>
+      <if test="price != null">
+        price = #{price,jdbcType=DOUBLE},
+      </if>
+      <if test="orderState != null">
+        order_state = #{orderState,jdbcType=INTEGER},
+      </if>
+      <if test="orderTime != null">
+        order_time = #{orderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="toUserId != null">
+        to_user_id = #{toUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentValue != null">
+        payment_value = #{paymentValue,jdbcType=DOUBLE},
+      </if>
+      <if test="paymentType != null">
+        payment_type = #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentId != null">
+        payment_id = #{paymentId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.ConsultOrder">
+    update consult_order
+    set price = #{price,jdbcType=DOUBLE},
+      order_state = #{orderState,jdbcType=INTEGER},
+      order_time = #{orderTime,jdbcType=TIMESTAMP},
+      user_id = #{userId,jdbcType=VARCHAR},
+      to_user_id = #{toUserId,jdbcType=VARCHAR},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      payment_value = #{paymentValue,jdbcType=DOUBLE},
+      payment_type = #{paymentType,jdbcType=VARCHAR},
+      payment_id = #{paymentId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -115,8 +115,5 @@
     <update id="updateUserLvl" parameterType="java.util.Map">
         UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
     </update>
-    
-    
-    
-    
+  
 </mapper>

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

@@ -34,6 +34,10 @@
 		<if test="website != null">
 			and b.website = #{website,jdbcType=VARCHAR}
 		</if>
+		<if test="picRequired != null">
+			and a.title_img is not null and a.title_img != ''
+		</if>
+		
 		order by create_time desc
 		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
 	</select>
@@ -126,7 +130,32 @@
 			#{item}
 	</foreach>
   </delete>
-  <select id="findJmrhNewsList" parameterType="String" resultMap="SummaryResultMap">
+  
+  <select id="findPortalList" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			a.create_time as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source
+		from news a
+		join branch_office_info b
+		on a.province_id = b.province_id
+		where 1 =1
+		<if test="type != null and type != 0" >
+			and a.type = #{type,jdbcType=INTEGER}
+		</if>
+		<if test="website != null">
+			and b.website = #{website,jdbcType=VARCHAR}
+		</if>
+		order by create_time desc
+		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
+	</select>
+	
+	<select id="findJmrhNewsList" parameterType="String" resultMap="SummaryResultMap">
 		select 
 			id,title,create_time 
 		from 

+ 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" >
+        and 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" >
+       and u.type = #{userType}
+   	 </if>
   </select>
   
   <select id="countByToUid" parameterType="java.lang.String" resultType="java.lang.Integer">

File diff suppressed because it is too large
+ 1 - 1009
src/main/java/com/goafanti/common/mapper/UserMapper.xml


+ 132 - 0
src/main/java/com/goafanti/common/model/ConsultOrder.java

@@ -0,0 +1,132 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class ConsultOrder {
+    private Long id;
+
+    /**
+    * 价格
+    */
+    private Double price;
+
+    /**
+    * 付款状态  0:未付款 1:已付款
+    */
+    private Integer orderState;
+
+    /**
+    * 下单时间
+    */
+    private Date orderTime;
+
+    /**
+    * 用户ID 外键
+    */
+    private String userId;
+
+    /**
+    * 专家用户ID 外键
+    */
+    private String toUserId;
+
+    /**
+    * 支付时间
+    */
+    private Date paymentTime;
+
+    /**
+    * 实际支付金额
+    */
+    private Double paymentValue;
+
+    /**
+    * 支付方式
+    */
+    private String paymentType;
+
+    /**
+    * 支付流水号
+    */
+    private String paymentId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Integer getOrderState() {
+        return orderState;
+    }
+
+    public void setOrderState(Integer orderState) {
+        this.orderState = orderState;
+    }
+
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getToUserId() {
+        return toUserId;
+    }
+
+    public void setToUserId(String toUserId) {
+        this.toUserId = toUserId;
+    }
+
+    public Date getPaymentTime() {
+        return paymentTime;
+    }
+
+    public void setPaymentTime(Date paymentTime) {
+        this.paymentTime = paymentTime;
+    }
+
+    public Double getPaymentValue() {
+        return paymentValue;
+    }
+
+    public void setPaymentValue(Double paymentValue) {
+        this.paymentValue = paymentValue;
+    }
+
+    public String getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(String paymentType) {
+        this.paymentType = paymentType;
+    }
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+}

+ 41 - 28
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -117,32 +117,45 @@ public class MemberGradeController extends BaseApiController {
         maps.put("pNo", pNo);
         return res().data(maps);
     }
-    /**
-     * 后台会员更改
-     * 
-     * @param id
-     * @param memberRank
-     * @param validMonth
-     * @param paymentValue
-     * @param orderState
-     * @param paymentTime
-     * @param paymentType
-     * @return
-     */
-    @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<>();
-        umap.put("userId",userId);
-        umap.put("lvl",memberRank);
-        Map<String, Object> map = new HashMap<>();
-        map.put("id", id);
-        map.put("menberType", memberRank);
-        map.put("validMonth", validMonth);
-        map.put("paymentValue", paymentValue);
-        map.put("orderState", orderState);
-        map.put("paymentTime", paymentTime);
-        map.put("paymentType", paymentType);
-        return res().data(memberGradeService.updateMemberOrder(map, umap));
-    }
+	/**
+	 * 后台会员更改
+	 * 
+	 * @param id
+	 * @param memberRank
+	 * @param validMonth
+	 * @param paymentValue
+	 * @param orderState
+	 * @param paymentTime
+	 * @param paymentType
+	 * @return
+	 */
+	@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, String paymentId) {
+		Map<String, Object> umap = new HashMap<>();
+		umap.put("userId", userId);
+		umap.put("lvl", memberRank);
+		Map<String, Object> map = new HashMap<>();
+		map.put("id", id);
+		map.put("menberType", memberRank);
+		map.put("validMonth", validMonth);
+		map.put("paymentValue", paymentValue);
+		map.put("orderState", orderState);
+		map.put("paymentTime", paymentTime);
+		map.put("paymentType", paymentType);
+		map.put("paymentId", paymentId);
+		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));
+	}
+
 }

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

@@ -1,4 +1,5 @@
 package com.goafanti.memberGrade.controller;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -10,11 +11,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 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.common.utils.StringUtils;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.memberGrade.service.MemberGradeService;
+
 /**
  * 会员 前台
  * 
@@ -24,57 +26,62 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RestController
 @RequestMapping(value = "/api/user/member")
 public class MemberGradeFrontController extends BaseApiController {
-    @Autowired
-    private MemberGradeService	memberGradeService;
-    @Autowired
-    private JDBCIdGenerator		jDBCIdGenerator;
-    /**
-     * 前台会员订单
-     * 
-     * @return
-     */
-    @RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
-    public Result selectMemberOrder(String pageNo, String pageSize) {
-        Integer pNo = 1;
-        Integer pSize = 10;
-        if (StringUtils.isNumeric(pageSize)) {
-            pSize = Integer.parseInt(pageSize);
-        }
-        if (StringUtils.isNumeric(pageNo)) {
-            pNo = Integer.parseInt(pageNo);
-        }
-        Integer pNos = (pNo - 1) * pSize;
-        Map<String, Object> map = new HashMap<>();
-        map.put("pNos", pNos);
-        map.put("pSize", pSize);
-        map.put("id", TokenManager.getUserId());
-        List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
-        int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
-        Map<String, Object> maps = new HashMap<>();
-        maps.put("list", list);
-        maps.put("count", count);
-        maps.put("pNo", pNo);
-        return res().data(maps);
-    }
-    /**
-     * 前台生成订单
-     * 
-     * @param menberType
-     * @param price
-     * @param validMonth
-     * @return
-     */
-    @RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
-    public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
-        MemberOrder mo = new MemberOrder();
-        mo.setId(jDBCIdGenerator.generateId());
-        mo.setMenberType(menberType);
-        mo.setPrice(Double.valueOf(price));
-        mo.setValidMonth(validMonth);
-        mo.setOrderState(0);
-        mo.setOrderTime(new Date());
-        Assert.notNull(TokenManager.getUserToken(), "必须用户登录");
-        mo.setUserId(TokenManager.getUserId());
-        return res().data(memberGradeService.addBasicsMemberOrder(mo));
-    }
+	@Autowired
+	private MemberGradeService memberGradeService;
+	@Autowired
+	private JDBCIdGenerator jDBCIdGenerator;
+
+	/**
+	 * 前台会员订单
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberOrder", method = RequestMethod.GET)
+	public Result selectMemberOrder(String pageNo, String pageSize) {
+		Integer pNo = getPageNo(pageNo);
+		Integer pSize = getPageSize(pageSize);
+		Integer pNos = (pNo - 1) * pSize;
+		Map<String, Object> map = new HashMap<>();
+		map.put("pNos", pNos);
+		map.put("pSize", pSize);
+		map.put("id", TokenManager.getUserId());
+		List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
+		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("list", list);
+		maps.put("count", count);
+		maps.put("pNo", pNo);
+		return res().data(maps);
+	}
+
+	/**
+	 * 前台生成订单
+	 * 
+	 * @param menberType
+	 * @param price
+	 * @param validMonth
+	 * @return
+	 */
+	@RequestMapping(value = "/addBasicsMemberOrder", method = RequestMethod.GET)
+	public Result addBasicsMemberOrder(Integer menberType, String price, Integer validMonth) {
+		MemberOrder mo = new MemberOrder();
+		mo.setId(jDBCIdGenerator.generateId());
+		mo.setMenberType(menberType);
+		mo.setPrice(Double.valueOf(price));
+		mo.setValidMonth(validMonth);
+		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);
 	}
-	
-	
-	
-	
-	
 
 }

+ 11 - 2
src/main/java/com/goafanti/news/bo/NewsPortalList.java

@@ -8,12 +8,13 @@ public class NewsPortalList extends NewsSummary {
 	private String title;
 	
 	private String DataS;
-	
+
+	private String source;
 
 	public String getTitle() {
 		return title;
 	}
-
+
 	public void setTitle(String title) {
 		this.title = title;
 	}
@@ -24,6 +25,14 @@ public class NewsPortalList extends NewsSummary {
 
 	public void setContent(String content) {
 		this.content = content;
+	}
+	
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
 	}
 
 	public String getDataS() {

+ 24 - 23
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -28,9 +28,9 @@ import com.goafanti.news.service.NewsService;
 @Controller
 public class NewsController extends BaseController {
 	@Resource
-	NewsService				newsService;
+	NewsService newsService;
 	@Resource
-	private BannersService	bannersService;
+	private BannersService bannersService;
 
 	/**
 	 * 策源地
@@ -46,11 +46,11 @@ public class NewsController extends BaseController {
 			newsService.cleanList();
 		}
 		String domainName = request.getServerName();
-		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2,domainName));
-		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2,domainName));
-		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3,domainName));
-		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3,domainName));
-		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3,domainName));
+		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2, domainName, false));
+		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2, domainName, false));
+		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3, domainName, false));
+		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, false));
+		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3, domainName, false));
 		handleBanners(modelview, BannersType.CE_YUAN_DI);
 		return modelview;
 	}
@@ -63,7 +63,7 @@ public class NewsController extends BaseController {
 		modelview.setViewName("/portal/news/newsDetails");
 		return modelview;
 	}
-	
+
 	/**
 	 * 新闻详情APP
 	 */
@@ -78,16 +78,17 @@ public class NewsController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
 	@ResponseBody
-	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot,Integer provinceId,String keyword) {
+	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
+			String keyword) {
 		Result res = new Result();
-		Integer pNo = 1,pSize = 4;
+		Integer pNo = 1, pSize = 4;
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}
-		res.setData(newsService.portalNewsList(pSize,pNo, type,hot,provinceId,keyword));
+		res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword));
 		return res;
 	}
 
@@ -102,24 +103,24 @@ public class NewsController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻ID"));
 			return res;
 		}
-		
-		/*newsService.portalNewsList(6,1, type,hot,provinceId,keyword)*/
-		
+
+		/* newsService.portalNewsList(6,1, type,hot,provinceId,keyword) */
+
 		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
 
 	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
-	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview,Long id) {
+	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id) {
 		modelview.setViewName("/portal/news/newsDetail");
-		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6,1,5,null,null,null);
+		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
 		News newsDetail = newsService.findNewsDetail(id);
 		Object news = newsList.getList().get(0);
-		SimpleDateFormat fmt =new SimpleDateFormat();
-		newsDetail.setCreateTimeS(fmt.format( newsDetail.getCreateTime()));
+		SimpleDateFormat fmt = new SimpleDateFormat();
+		newsDetail.setCreateTimeS(fmt.format(newsDetail.getCreateTime()));
 		@SuppressWarnings("unchecked")
-		List<NewsPortalList> la = (List<NewsPortalList>)newsList.getList();
-		for(NewsPortalList n : la) {
+		List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
+		for (NewsPortalList n : la) {
 			String createTimeFormattedDate = n.getCreateTimeFormattedDate();
 			n.setDataS(createTimeFormattedDate);
 		}
@@ -127,14 +128,14 @@ public class NewsController extends BaseController {
 		modelview.addObject("newsList", newsList.getList());
 		modelview.addObject("news", news);
 		return modelview;
-		
+
 	}
 
-	private void handleBanners(ModelAndView modelview,  BannersType bannersType) {
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banners", banners);
 		}
 	}
 
-}
+}

+ 30 - 20
src/main/java/com/goafanti/news/service/NewsService.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
@@ -29,10 +30,12 @@ import com.goafanti.news.bo.NewsSummary;
 @Transactional
 public class NewsService extends BaseMybatisDao<NewsMapper> {
 	@Autowired
-	NewsMapper					newsMapper;
+	NewsMapper newsMapper;
+	@Value("${spring.profiles.active}")
+	private String env;
+
+	private static final Logger logger = LoggerFactory.getLogger(NewsService.class);
 
-	private static final Logger	logger	= LoggerFactory.getLogger(NewsService.class);
-	
 	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
 	public List<NewsSummary> findIndexNewsList(Integer pageNo, Integer type, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -52,13 +55,19 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return newsMapper.selectByPrimaryKey(id);
 	}
 
-	@Cacheable(value = "NewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName")
-	public List<NewsSummary> findNewsList(Integer pageNo, Integer type, Integer pageSize,String domainName) {
+	@Cacheable(value = "NewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName+'picReq:'+#picRequired")
+	public List<NewsSummary> findNewsList(Integer pageNo, Integer type, Integer pageSize, String domainName,
+			Boolean picRequired) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("type", type);
 		params.put("pageSize", pageSize);
 		params.put("pageNo", pageNo);
-		params.put("website", domainName);
+		if (!StringUtils.equals(env, "dev") && !StringUtils.equals(env, "local")) {
+			params.put("website", domainName);
+		}
+		if (picRequired) {
+			params.put("picRequired", picRequired);
+		}
 		return newsMapper.findList(params);
 	}
 
@@ -78,7 +87,7 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		newsMapper.insert(news);
 		return news;
 	}
-	
+
 	@CachePut(value = "NewsCache", key = "'News:'+#id")
 	public News update(long id, News news) {
 		newsMapper.updateByPrimaryKeyWithBLOBs(news);
@@ -118,8 +127,8 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		if (StringUtils.isNotBlank(source)) {
 			params.put("source", source);
 		}
-		
-		if (null != hot){
+
+		if (null != hot) {
 			params.put("hot", hot);
 		}
 
@@ -140,20 +149,21 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 	public int batchDeleteByPrimaryKey(List<String> id) {
 		return newsMapper.batchDeleteByPrimaryKey(id);
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public Pagination<NewsPortalList> portalNewsList(Integer pSize, Integer pNo, Integer type,Integer hot,Integer provinceId,String keyword) {
+	public Pagination<NewsPortalList> portalNewsList(Integer pSize, Integer pNo, Integer type, Integer hot,
+			Integer provinceId, String keyword) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if (null != hot){
+		if (null != hot) {
 			params.put("hot", hot);
 		}
-		if(null != type){
+		if (null != type) {
 			params.put("type", type);
 		}
-		if(null != provinceId){
+		if (null != provinceId) {
 			params.put("provinceId", provinceId);
 		}
-		if(null != keyword){
+		if (null != keyword) {
 			params.put("keyword", keyword);
 		}
 		if (pNo == null || pNo < 0) {
@@ -162,19 +172,19 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<NewsPortalList>) findPage("portalNewsList","portalNewsCount",params,pNo,pSize);
+		return (Pagination<NewsPortalList>) findPage("portalNewsList", "portalNewsCount", params, pNo, pSize);
 	}
-	
+
 	@CacheEvict(value = "NewsPortalListCache", allEntries = true)
 	public void cleanPortalList() {
 		LoggerUtils.debug(logger, "清除门户端新闻列表缓存");
-		
+
 	}
 
-	public List<NewsSummary> findJmrhNewsList(String type){
+	public List<NewsSummary> findJmrhNewsList(String type) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("type", type);
 		return newsMapper.findJmrhNewsList(params);
 	}
 
-}
+}

+ 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

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.41
+static.host=//afts.hnzhiming.com/1.0.43
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.11
+portal.host=//afts.hnzhiming.com/portal/1.0.12
 
 patentTemplate=SMS_72005286
 

+ 7 - 3
src/main/resources/props/config_prod.properties

@@ -51,12 +51,16 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//sf.jishutao.com/1.0.40
+static.host=//s.jishutao.com/1.0.41
 
 template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//sf.jishutao.com/portal/1.0.10
+portal.host=//s.jishutao.com/portal/1.0.11
 
-patentTemplate=SMS_72005286
+patentTemplate=SMS_72005286
+
+avatar.host=//s.jishutao.com
+
+avatar.upload.host=//s.jishutao.com/upload

+ 2 - 2
src/main/resources/spring/spring-shiro.xml

@@ -53,7 +53,7 @@
 	
 	<bean id="shrioRedisCacheManager" class="com.goafanti.core.shiro.cache.ShiroRedisCacheManager">
 		<property name="redisTemplate" ref="sessionRedisTemplate" />
-		<property name="expire" value="43200" />
+		<property name="expire" value="2592000" />
 	</bean>
 
 	<bean id="sessionIdGenerator"
@@ -63,7 +63,7 @@
 	<bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
 		<constructor-arg value="AFT_SID" />
 		<property name="httpOnly" value="true" />
-		<property name="maxAge" value="1296000" />
+		<property name="maxAge" value="2592000" />
 		<!-- <property name="domain" value=""/> -->
 	</bean>
 

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/userOrder.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>科技思想页</title>
+	<link th:href="${staticHost+'/admin/userOrder.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/userOrder.js'}"></script>
+	</div>
+</body>
+</html>

+ 16 - 0
src/main/webapp/WEB-INF/views/portal/membership.html

@@ -26,6 +26,22 @@
 			<ul id="member-list" class="clearfix">
 			</ul>
 		</div>
+		<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+						<h4 class="modal-title" id="myModalLabel">会员订单提交</h4>
+					</div>
+					<div class="modal-body" id="modal-content">
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+						<button type="button" class="btn btn-primary" id="submitOrder">提交订单</button>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 	<footer>
 		<div th:replace="common::copyright"></div>