Browse Source

Accept Merge Request #226 app 接口发布线上 : (master -> prod)

Merge Request: app 接口发布线上
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/226
albertshaw 8 years ago
parent
commit
8f41bf5788
49 changed files with 1594 additions and 270 deletions
  1. 9 0
      schema/20170829-member_grade.sql
  2. 15 0
      schema/20170901-member_order.sql
  3. 2 0
      schema/20170911-achievement-intro-length.sql
  4. 13 0
      schema/20170913-consult-order.sql
  5. 6 0
      src/main/java/com/goafanti/activityUser/service/ActivityUserService.java
  6. 7 0
      src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java
  7. 0 6
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  8. 8 9
      src/main/java/com/goafanti/app/controller/AppApiController.java
  9. 3 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  10. 4 3
      src/main/java/com/goafanti/common/controller/PortalController.java
  11. 6 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  12. 13 8
      src/main/java/com/goafanti/common/dao/ActivityUserMapper.java
  13. 17 0
      src/main/java/com/goafanti/common/dao/ConsultOrderMapper.java
  14. 24 6
      src/main/java/com/goafanti/common/dao/MemberGradeMapper.java
  15. 17 0
      src/main/java/com/goafanti/common/dao/MemberOrderMapper.java
  16. 53 0
      src/main/java/com/goafanti/common/enums/OrderState.java
  17. 6 6
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  18. 8 1
      src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml
  19. 153 0
      src/main/java/com/goafanti/common/mapper/ConsultOrderMapper.xml
  20. 148 31
      src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml
  21. 177 0
      src/main/java/com/goafanti/common/mapper/MemberOrderMapper.xml
  22. 6 6
      src/main/java/com/goafanti/common/mapper/MyAppMapper.xml
  23. 5 2
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  24. 12 1
      src/main/java/com/goafanti/common/mapper/UserInterestMapper.xml
  25. 7 3
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  26. 5 1
      src/main/java/com/goafanti/common/model/ActivityUserKey.java
  27. 132 0
      src/main/java/com/goafanti/common/model/ConsultOrder.java
  28. 237 0
      src/main/java/com/goafanti/common/model/MemberOrder.java
  29. 1 1
      src/main/java/com/goafanti/core/shiro/token/TokenManager.java
  30. 108 14
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
  31. 92 0
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java
  32. 50 18
      src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java
  33. 1 11
      src/main/java/com/goafanti/news/bo/NewsPortalList.java
  34. 13 12
      src/main/java/com/goafanti/news/controller/NewsController.java
  35. 25 16
      src/main/java/com/goafanti/news/service/NewsService.java
  36. 43 0
      src/main/java/com/goafanti/portal/controller/PortalMemberController.java
  37. 8 0
      src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java
  38. 10 0
      src/main/java/com/goafanti/user/bo/InterestUserListBo.java
  39. 10 0
      src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java
  40. 12 0
      src/main/java/com/goafanti/user/bo/UserPageHomeBo.java
  41. 10 0
      src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java
  42. 15 14
      src/main/java/com/goafanti/user/controller/UserInterestApiController.java
  43. 1 1
      src/main/java/com/goafanti/user/service/UserInterestService.java
  44. 9 3
      src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java
  45. 2 2
      src/main/resources/props/config_dev.properties
  46. 2 2
      src/main/resources/spring/spring-shiro.xml
  47. 16 0
      src/main/webapp/WEB-INF/views/admin/userOrder.html
  48. 59 53
      src/main/webapp/WEB-INF/views/common.html
  49. 14 39
      src/main/webapp/WEB-INF/views/portal/membership.html

+ 9 - 0
schema/20170829-member_grade.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `member_grade` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `grade_name` varchar(50) NOT NULL,
+  `business` longtext,
+  `cost` longtext,
+  `member_rank` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `gradeName_UNIQUE` (`grade_name`)
+)

+ 15 - 0
schema/20170901-member_order.sql

@@ -0,0 +1,15 @@
+CREATE TABLE `member_order` (
+  `id` bigint(19) NOT NULL,
+  `menber_type` int(11) NOT NULL COMMENT '付费会员类型',
+  `price` double(10,2) NOT NULL COMMENT '价格',
+  `valid_month` int(11) 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 外键',
+  `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 '支付流水号',
+  `valid_time` datetime DEFAULT NULL COMMENT '有效时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+ 2 - 0
schema/20170911-achievement-intro-length.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `achievement` 
+CHANGE COLUMN `introduction` `introduction` LONGTEXT NULL DEFAULT NULL COMMENT '成果简介' ;

+ 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`)
+)

+ 6 - 0
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -1,5 +1,9 @@
 package com.goafanti.activityUser.service;
 
+import java.util.List;
+
+import org.springframework.ui.ModelMap;
+
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
@@ -25,4 +29,6 @@ public interface ActivityUserService {
 
 	int batchDeleteByPrimaryKey(Long aid, String uid);
 
+	List<ModelMap> selectUserActivities();
+
 }

+ 7 - 0
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -2,10 +2,12 @@ package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.activityUser.service.ActivityUserService;
@@ -121,4 +123,9 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		return activityUserMapper.selectByAidAndUid(aid, uid);
 	}
 
+	@Override
+	public List<ModelMap> selectUserActivities() {
+		return activityUserMapper.selectUserActivities(TokenManager.getUserId());
+	}
+
 }

+ 0 - 6
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -609,12 +609,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 				return res;
 			}
 
-			if (bo.getIntroduction().length() > 298) {
-				res.getError().add(buildError(ErrorConstants.PARAM_SIZE_ERROR, "",
-						AchievementImportFields.INTRODUCTION.getDesc()));
-				return res;
-			}
-
 			if (bo.getKeyword().length() > 44) {
 				res.getError().add(
 						buildError(ErrorConstants.PARAM_SIZE_ERROR, "", AchievementImportFields.KEYWORD.getDesc()));

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

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

@@ -73,7 +73,7 @@ public class PortalController extends BaseController {
 			demand = demandService.findOrgPortalDemandDetail(id);
 		}
 		if (null != demand) {
-			if (null != demand.getBudgetCost()) {
+			if (null != demand.getBudgetCost() && demand.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
 				demand.setBudgetCostS(demand.getBudgetCost() + UNIT);
 			} else {
 				demand.setBudgetCostS(PRICE_NEGOTIABLE);
@@ -230,10 +230,11 @@ public class PortalController extends BaseController {
 			location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
 
 			if (null == achievement.getBargainingMode()
-					|| AchievementBargainingMode.NEGOTIABLE.equals(achievement.getBargainingMode())) {
+					|| AchievementBargainingMode.NEGOTIABLE.getCode().equals(achievement.getBargainingMode())) {
 				achievement.setTransferPriceS(PRICE_NEGOTIABLE);
 			} else {
-				if (null != achievement.getTransferPrice()) {
+				if (null != achievement.getTransferPrice()
+						&& achievement.getTransferPrice().compareTo(BigDecimal.ZERO) > 0) {
 					achievement.setTransferPriceS(achievement.getTransferPrice() + UNIT);
 				} else {
 					achievement.setTransferPriceS(PRICE_NEGOTIABLE);

+ 6 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -213,6 +213,12 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
+	@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/search/achievement");

+ 13 - 8
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -1,26 +1,31 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
+import org.springframework.ui.ModelMap;
 
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
 
 public interface ActivityUserMapper {
-    int deleteByPrimaryKey(ActivityUserKey key);
+	int deleteByPrimaryKey(ActivityUserKey key);
 
-    int insert(ActivityUser record);
+	int insert(ActivityUser record);
 
-    int insertSelective(ActivityUser record);
+	int insertSelective(ActivityUser record);
 
-    ActivityUser selectByPrimaryKey(ActivityUserKey key);
+	ActivityUser selectByPrimaryKey(ActivityUserKey key);
 
-    int updateByPrimaryKeySelective(ActivityUser record);
+	int updateByPrimaryKeySelective(ActivityUser record);
 
-    int updateByPrimaryKey(ActivityUser record);
+	int updateByPrimaryKey(ActivityUser record);
 
 	ActivityUser selectByUid(String uid);
 
-	int batchDeleteByPrimaryKey(@Param("aid")Long aid, @Param("uid")String uid);
+	int batchDeleteByPrimaryKey(@Param("aid") Long aid, @Param("uid") String uid);
+
+	ActivityUser selectByAidAndUid(@Param("aid") Long aid, @Param("uid") String uid);
 
-	ActivityUser selectByAidAndUid(@Param("aid")Long aid, @Param("uid")String uid);
+	List<ModelMap> selectUserActivities(@Param("uid") String uid);
 }

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

+ 24 - 6
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -1,18 +1,36 @@
 package com.goafanti.common.dao;
 
 import java.util.List;
+import java.util.Map;
 
+import com.goafanti.common.model.MemberOrder;
 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);
+
 }

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

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

+ 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;
+	}
+
+}

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

@@ -9,7 +9,7 @@
     <result column="keyword" jdbcType="VARCHAR" property="keyword" />
     <result column="category" jdbcType="INTEGER" property="category" />
     <result column="summary" jdbcType="VARCHAR" property="summary" />
-    <result column="introduction" jdbcType="VARCHAR" property="introduction" />
+    <result column="introduction" jdbcType="LONGVARCHAR" property="introduction" />
     <result column="technical_picture_url" jdbcType="VARCHAR" property="technicalPictureUrl" />
     <result column="field_a" jdbcType="INTEGER" property="fieldA" />
     <result column="field_b" jdbcType="INTEGER" property="fieldB" />
@@ -100,7 +100,7 @@
       country_name_zh,international_flag,jmrh_flag)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
-      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
+      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
       #{fieldA,jdbcType=INTEGER}, #{fieldB,jdbcType=INTEGER}, #{fieldC,jdbcType=INTEGER}, 
       #{maturity,jdbcType=INTEGER}, #{maturityPictureUrl,jdbcType=LONGVARCHAR}, #{maturityTextFileUrl,jdbcType=VARCHAR}, 
       #{maturityVideoUrl,jdbcType=VARCHAR}, #{innovation,jdbcType=INTEGER}, #{ownerId,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR},
@@ -309,7 +309,7 @@
         #{summary,jdbcType=VARCHAR},
       </if>
       <if test="introduction != null">
-        #{introduction,jdbcType=VARCHAR},
+        #{introduction,jdbcType=LONGVARCHAR},
       </if>
       <if test="technicalPictureUrl != null">
         #{technicalPictureUrl,jdbcType=VARCHAR},
@@ -476,7 +476,7 @@
         summary = #{summary,jdbcType=VARCHAR},
       </if>
       <if test="introduction != null">
-        introduction = #{introduction,jdbcType=VARCHAR},
+        introduction = #{introduction,jdbcType=LONGVARCHAR},
       </if>
       <if test="technicalPictureUrl != null">
         technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
@@ -630,7 +630,7 @@
       keyword = #{keyword,jdbcType=VARCHAR},
       category = #{category,jdbcType=INTEGER},
       summary = #{summary,jdbcType=VARCHAR},
-      introduction = #{introduction,jdbcType=VARCHAR},
+      introduction = #{introduction,jdbcType=LONGVARCHAR},
       technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
       field_a = #{fieldA,jdbcType=INTEGER},
       field_b = #{fieldB,jdbcType=INTEGER},
@@ -1054,7 +1054,7 @@
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
-      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=VARCHAR}
+      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR}
       )
     </foreach>
   </insert>

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

@@ -210,11 +210,18 @@
       and uid = #{uid,jdbcType=VARCHAR}
   </delete>
   
-    <select id="selectByAidAndUid" resultMap="BaseResultMap" >
+  <select id="selectByAidAndUid" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />
     from activity_user
     where aid = #{aid,jdbcType=BIGINT}
       and uid = #{uid,jdbcType=VARCHAR}
   </select>
+  <select id="selectUserActivities" resultType="org.springframework.ui.ModelMap">
+	select au.aid as aid, au.uid as uid, a.name as name,a.start_time as startTime, a.end_time as endTime, a.enroll_deadline as enrollDeadline
+    from activity_user au
+    left join activity a on au.aid=a.id
+    where uid = #{uid,jdbcType=VARCHAR}
+    order by au.create_time desc
+  </select>
 </mapper>

+ 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>

+ 148 - 31
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,40 +1,157 @@
 <?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.MemberGradeMapper">
- 
-  	<!-- 查询所有 -->
-	<select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
-		SELECT * FROM member_grade;
+
+
+	<resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
+		<id column="id" property="id" />
+		<result column="menber_type" property="menberType" />
+		<result column="grade_name" property="gradeName" />
+		<result column="price" property="price" />
+		<result column="valid_month" property="validMonth" />
+		<result column="order_state" property="orderState" />
+		<result column="order_time" property="orderTime" />
+		<result column="user_id" property="userId" />
+		<result column="payment_time" property="paymentTime" />
+		<result column="payment_value" property="paymentValue" />
+		<result column="payment_type" property="paymentType" />
+		<result column="payment_id" property="paymentId" />
+		<result column="valid_time" property="validTime" />
+	</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" resultMap="memberGradeMap">
+		SELECT * FROM
+		member_grade;
 	</select>
-	 
+
 	<!-- 删除会员等级 -->
 	<delete id="delGrade" parameterType="int">
-		DELETE FROM member_grade WHERE id=#{id}
+		DELETE FROM member_grade
+		WHERE id=#{id}
 	</delete>
-  
-  	
-  	<!-- 新增会员等级是否存在 -->
-  	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade" resultType="int">
-  		SELECT COUNT(*) FROM member_grade WHERE memberRank=#{memberRank}
-  	</select>
-  	
-  
-  	<!-- 新增会员等级 -->
-	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade" useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
-	</insert> 
-  
-  
-  	<!-- 为等级添加业务和费用 -->
-    <update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
-    	UPDATE member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
-    </update>
-  
-  
-  
-  
-  
-  
-  
 
+	<!-- 新增会员等级是否存在 -->
+	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		resultType="int">
+		SELECT COUNT(*) FROM member_grade WHERE
+		member_rank=#{memberRank}
+	</select>
+
+
+	<!-- 新增会员等级 -->
+	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO
+		member_grade(grade_name,member_rank) VALUES (#{gradeName},#{memberRank})
+	</insert>
+
+
+	<!-- 为等级添加业务和费用 -->
+	<update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
+		UPDATE
+		member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
+	</update>
+
+
+	<!-- 前台会员订单查询 -->
+	<select id="selectMemberOrder" parameterType="java.util.Map"
+		resultMap="memberOrderMap">
+		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.member_rank=mo.menber_type
+		WHERE user_id=#{id} and mo.order_state &lt; 9
+		LIMIT #{pNos},#{pSize}
+	</select>
+
+
+	<!-- 后台会员订单查询 -->
+	<select id="selectMemberOrderBa" parameterType="java.util.Map"
+		resultMap="memberOrderMap">
+		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.member_rank=mo.menber_Type
+		LEFT JOIN user u ON
+		u.id=mo.user_id
+		WHERE 1=1
+		<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 = #{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>
+		LIMIT #{pNos},#{pSize}
+	</select>
+
+
+	<!-- 后台查询总记录 -->
+	<select id="countMemberOrderWhere" parameterType="java.util.Map"
+		resultType="int">
+		SELECT COUNT(*) FROM member_order mo
+		LEFT JOIN user u ON u.id=mo.user_id
+		WHERE 1=1
+		<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 = #{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>
+
+	<!-- 前台生成订单 -->
+	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
+		INSERT INTO
+		member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
+		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
+	</insert>
+
+	<select id="countMemberOrder" parameterType="String"  resultType="int">
+		SELECT COUNT(*) FROM
+		member_order
+		WHERE  user_id=#{userId} and order_state &lt; 9
+	</select>
+
+	<!-- 后台订单更改 -->
+	<update id="updateMemberOrder" parameterType="java.util.Map" >
+		UPDATE member_order SET 
+		menber_type=#{menberType},
+		valid_month=#{validMonth},
+		payment_value=#{paymentValue},
+		order_state=#{orderState},
+		payment_time=#{paymentTime},
+		payment_type=#{paymentType},
+		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>

+ 177 - 0
src/main/java/com/goafanti/common/mapper/MemberOrderMapper.xml

@@ -0,0 +1,177 @@
+<?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.MemberOrderMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MemberOrder">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="menber_type" jdbcType="INTEGER" property="menberType" />
+    <result column="price" jdbcType="DOUBLE" property="price" />
+    <result column="valid_month" jdbcType="INTEGER" property="validMonth" />
+    <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="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" />
+    <result column="valid_time" jdbcType="TIMESTAMP" property="validTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, menber_type, price, valid_month, order_state, order_time, user_id, payment_time, 
+    payment_value, payment_type, payment_id, valid_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from member_order
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from member_order
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MemberOrder">
+    insert into member_order (id, menber_type, price, 
+      valid_month, order_state, order_time, 
+      user_id, payment_time, payment_value, 
+      payment_type, payment_id, valid_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{menberType,jdbcType=INTEGER}, #{price,jdbcType=DOUBLE}, 
+      #{validMonth,jdbcType=INTEGER}, #{orderState,jdbcType=INTEGER}, #{orderTime,jdbcType=TIMESTAMP}, 
+      #{userId,jdbcType=VARCHAR}, #{paymentTime,jdbcType=TIMESTAMP}, #{paymentValue,jdbcType=DOUBLE}, 
+      #{paymentType,jdbcType=VARCHAR}, #{paymentId,jdbcType=VARCHAR}, #{validTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MemberOrder">
+    insert into member_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="menberType != null">
+        menber_type,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="validMonth != null">
+        valid_month,
+      </if>
+      <if test="orderState != null">
+        order_state,
+      </if>
+      <if test="orderTime != null">
+        order_time,
+      </if>
+      <if test="userId != null">
+        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>
+      <if test="validTime != null">
+        valid_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="menberType != null">
+        #{menberType,jdbcType=INTEGER},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DOUBLE},
+      </if>
+      <if test="validMonth != null">
+        #{validMonth,jdbcType=INTEGER},
+      </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="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>
+      <if test="validTime != null">
+        #{validTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MemberOrder">
+    update member_order
+    <set>
+      <if test="menberType != null">
+        menber_type = #{menberType,jdbcType=INTEGER},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DOUBLE},
+      </if>
+      <if test="validMonth != null">
+        valid_month = #{validMonth,jdbcType=INTEGER},
+      </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="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>
+      <if test="validTime != null">
+        valid_time = #{validTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MemberOrder">
+    update member_order
+    set menber_type = #{menberType,jdbcType=INTEGER},
+      price = #{price,jdbcType=DOUBLE},
+      valid_month = #{validMonth,jdbcType=INTEGER},
+      order_state = #{orderState,jdbcType=INTEGER},
+      order_time = #{orderTime,jdbcType=TIMESTAMP},
+      user_id = #{userId,jdbcType=VARCHAR},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      payment_value = #{paymentValue,jdbcType=DOUBLE},
+      payment_type = #{paymentType,jdbcType=VARCHAR},
+      payment_id = #{paymentId,jdbcType=VARCHAR},
+      valid_time = #{validTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -23,14 +23,14 @@
   </select>
   <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 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 a.owner_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(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  <![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 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 d.employer_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(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 <![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>

+ 5 - 2
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>
@@ -136,8 +140,7 @@
 			a.type,
 			a.hot,
 			a.summary,
-			a.source,
-			a.content
+			a.source
 		from news a
 		join branch_office_info b
 		on a.province_id = b.province_id

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

@@ -92,6 +92,7 @@
 	SELECT
 			uii.username,
 			oi.unit_name AS unitName,
+			u.number,
 			u.type,
 			u.id AS uid,
 			ui.id AS interestId,
@@ -106,14 +107,20 @@
 		user_interest ui
 	LEFT JOIN user_identity uii ON uii.uid = ui.to_uid
 	LEFT JOIN organization_identity oi ON oi.uid = ui.to_uid
-	LEFT JOIN <![CDATA[user]]> u ON u.id = ui.to_uid
+	LEFT JOIN `user` u ON u.id = ui.to_uid
 	LEFT JOIN user_info uinfo ON uinfo.uid = ui.to_uid
 	LEFT JOIN organization_info oinfo ON oinfo.uid = ui.to_uid
 	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">
@@ -121,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">

+ 7 - 3
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>
   
@@ -755,6 +757,7 @@
   
   <select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
   	SELECT
+  		u.number,
 		ui.username,
 		ui.province,
 		ui.city,
@@ -767,7 +770,7 @@
 		info.life_photo_url AS lifePhotoUrl,
 		interest.id as interestId
 	FROM
-		<![CDATA[ user ]]> u
+	`user` u
 	LEFT JOIN user_identity ui ON ui.uid = u.id
 	LEFT JOIN user_career uc ON uc.uid = u.id
 	LEFT JOIN user_ability ua ON ua.uid = u.id
@@ -780,6 +783,7 @@
   
   <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
   	SELECT
+  		u.number,
 		oi.unit_name AS unitName,
 		oi.licence_province AS province,
 		oi.licence_city AS city,
@@ -792,7 +796,7 @@
 		ot.search_area_category as field, 
 		interest.id as interestId
 	FROM
-	<![CDATA[ user ]]> u
+	`user` u
 	LEFT JOIN organization_identity oi ON oi.uid = u.id
 	LEFT JOIN organization_info info ON info.uid = u.id
 	LEFT JOIN organization_tech ot ON ot.uid = u.id

+ 5 - 1
src/main/java/com/goafanti/common/model/ActivityUserKey.java

@@ -1,5 +1,8 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
 public class ActivityUserKey {
     /**
     * 活动id
@@ -19,7 +22,8 @@ public class ActivityUserKey {
     	this.aid = aid;
     	this.uid = uid;
     }
-
+    
+    @JsonFormat(shape = Shape.STRING)
     public Long getAid() {
         return aid;
     }

+ 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;
+    }
+}

+ 237 - 0
src/main/java/com/goafanti/common/model/MemberOrder.java

@@ -0,0 +1,237 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class MemberOrder {
+	private Long	id;
+
+	/**
+	 * 付费会员类型
+	 */
+	private Integer	menberType;
+
+	/**
+	 * 价格
+	 */
+	private Double	price;
+
+	/**
+	 * 会员月类型
+	 */
+	private Integer	validMonth;
+
+	/**
+	 * 付款状态 0:未付款 1:已付款
+	 */
+	private Integer	orderState;
+
+	/**
+	 * 下单时间
+	 */
+	private Date	orderTime;
+
+	/**
+	 * 用户ID 外键
+	 */
+	private String	userId;
+
+	/**
+	 * 支付时间
+	 */
+	private Date	paymentTime;
+
+	/**
+	 * 实际支付金额
+	 */
+	private Double	paymentValue;
+
+	/**
+	 * 支付方式
+	 */
+	private String	paymentType;
+
+	/**
+	 * 支付流水号
+	 */
+	private String	paymentId;
+
+	/**
+	 * 有效时间
+	 */
+	private Date	validTime;
+
+	// 会员类型名称
+	private String	gradeName;
+
+	// 手机登录号
+	private String	mobile;
+	// 昵称
+	private String	nickname;
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getNickname() {
+		return nickname;
+	}
+
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getMenberType() {
+		return menberType;
+	}
+
+	public void setMenberType(Integer menberType) {
+		this.menberType = menberType;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Integer getValidMonth() {
+		return validMonth;
+	}
+
+	public void setValidMonth(Integer validMonth) {
+		this.validMonth = validMonth;
+	}
+
+	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 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;
+	}
+
+	public Date getValidTime() {
+		return validTime;
+	}
+
+	public void setValidTime(Date validTime) {
+		this.validTime = validTime;
+	}
+
+	// 下单时间转换
+	public String getFormattedOrderTime() {
+		if (this.orderTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.orderTime, AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setFormattedOrderTime(String formattedOrderTime) {
+
+	}
+
+	//
+	public String getFormattedPaymentTime() {
+		if (this.paymentTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.paymentTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setFormattedPaymentTime(String formattedPaymentTime) {
+
+	}
+
+	//
+	public String getFormattedValidTime() {
+		if (this.validTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.validTime, AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setFormattedValidTime(String formattedValidTime) {
+
+	}
+
+}

+ 1 - 1
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -18,7 +18,7 @@ public class TokenManager {
 	/**
 	 * 获取当前登录的用户User对象
 	 * 
-	 * @return
+	 * @return
 	 */
 	public static AftUser getToken() {
 		return (AftUser) SecurityUtils.getSubject().getPrincipal();

+ 108 - 14
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -1,7 +1,10 @@
 package com.goafanti.memberGrade.controller;
 
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,12 +12,23 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 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.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
 
+/**
+ * 会员等级管理 后台
+ * 
+ * @author Administrator
+ *
+ */
 @RestController
 @RequestMapping(value = "/api/admin/member")
 public class MemberGradeController extends BaseApiController {
@@ -43,35 +57,115 @@ public class MemberGradeController extends BaseApiController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/delGrade", method = RequestMethod.GET)
+	@RequestMapping(value = "/delGrade", method = RequestMethod.POST)
 	public Result delGrade(int id) {
 		return res().data(memberGradeService.delGrade(id));
 	}
-	
+
 	/**
 	 * 新增会员等级名称
+	 * 
 	 * @param name
 	 * @return
 	 */
-	@RequestMapping(value = "/addGradeName",method = RequestMethod.GET)
-	public Result addGradeName(MemberGrade me){
-		if(memberGradeService.selectRank(me)>=1){
-			return res().data(0);
+	@RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
+	public Result addGradeName(MemberGrade me) {
+		if (memberGradeService.selectRank(me) >= 1) {
+			Error e = new Error();
+			e.setMessage("该会员等级已存在");
+			return res().error(e);
 		}
-			memberGradeService.addGradeName(me);
-			return res().data(me.getId());
+		memberGradeService.addGradeName(me);
+		return res().data(me.getId());
 	}
-	
+
 	/**
-	 * 增加业务及费用  与更改
+	 * 增加业务及费用 与更改
+	 * 
 	 * @param me
 	 * @return
 	 */
-	@RequestMapping(value="/addBusinessAndCost",method=RequestMethod.GET)
-	public Result addBusinessAndCost(MemberGrade me){
+	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
+	public Result addBusinessAndCost(MemberGrade me) {
 		return res().data(memberGradeService.addBusinessAndCost(me));
 	}
-	
-	
+
+	/**
+	 * 后台会员订单列表单
+	 * 
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@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 = 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", id);
+		map.put("mobile", mobile);
+		map.put("nickname", nickname);
+		map.put("orderState", orderState);
+		map.put("startTimes", startTime);
+		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("countWhere", countWhere);
+		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, 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));
+	}
 
 }

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

@@ -0,0 +1,92 @@
+package com.goafanti.memberGrade.controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.memberGrade.service.MemberGradeService;
+
+/**
+ * 会员 前台
+ * 
+ * @author Administrator
+ *
+ */
+@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 = 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));
+	}
+
+}

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

@@ -1,45 +1,77 @@
 package com.goafanti.memberGrade.service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 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
 public class MemberGradeService {
 	@Autowired
 	private MemberGradeMapper memberGradeMapper;
-	
-	
+
 	public List<MemberGrade> selectMemberGrade() {
 		return memberGradeMapper.selectMemberGrade();
 	}
-	
+
 	public int delGrade(int id) {
 		return memberGradeMapper.delGrade(id);
-	} 
-	
-	
-	
-	public int selectRank(MemberGrade me){
+	}
+
+	public int selectRank(MemberGrade me) {
 		return memberGradeMapper.selectRank(me);
 	}
-	
-	
+
 	public int addGradeName(MemberGrade me) {
 		return memberGradeMapper.addGradeName(me);
 	}
-	
-	
-	public int addBusinessAndCost(MemberGrade me){
+
+	public int addBusinessAndCost(MemberGrade me) {
 		return memberGradeMapper.addBusinessAndCost(me);
 	}
-	
-	
-	
-	
-	
+
+	public List<MemberOrder> selectMemberOrder(Map<String, Object> map) {
+		return memberGradeMapper.selectMemberOrder(map);
+	}
+
+	public List<MemberOrder> selectMemberOrderBa(Map<String, Object> map) {
+		return memberGradeMapper.selectMemberOrderBa(map);
+	}
+
+	public int countMemberOrder(String userId) {
+		return memberGradeMapper.countMemberOrder(userId);
+	}
+
+	public int addBasicsMemberOrder(MemberOrder mo) {
+		return memberGradeMapper.addBasicsMemberOrder(mo);
+	}
+
+	public int countMemberOrderWhere(Map<String, Object> map) {
+		return memberGradeMapper.countMemberOrderWhere(map);
+	}
+
+	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);
+	}
+
 }

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

@@ -1,9 +1,7 @@
 package com.goafanti.news.bo;
 
 public class NewsPortalList extends NewsSummary {
-	private String	source;
-
-	private String	content;
+	private String source;
 
 	public String getSource() {
 		return source;
@@ -13,12 +11,4 @@ public class NewsPortalList extends NewsSummary {
 		this.source = source;
 	}
 
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
 }

+ 13 - 12
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -42,11 +42,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;
 	}
@@ -59,7 +59,7 @@ public class NewsController extends BaseController {
 		modelview.setViewName("/portal/news/newsDetails");
 		return modelview;
 	}
-	
+
 	/**
 	 * 新闻详情APP
 	 */
@@ -74,7 +74,8 @@ public class NewsController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
 	@ResponseBody
-	public Result portalNewsList(Integer type, String pageSize, String pageNo, String noCache,HttpServletRequest request) {
+	public Result portalNewsList(Integer type, String pageSize, String pageNo, String noCache,
+			HttpServletRequest request) {
 		Result res = new Result();
 		if (StringUtils.equals(noCache, "clear")) {
 			newsService.cleanPortalList();
@@ -82,7 +83,7 @@ public class NewsController extends BaseController {
 		String domainName = request.getServerName();
 		Integer pN = getPageNo(pageNo);
 		Integer pS = getPageSize(pageSize);
-		res.setData(newsService.findPortalList(pS, (pN - 1) * pS, type,domainName));
+		res.setData(newsService.findPortalList(pS, (pN - 1) * pS, type, domainName));
 		return res;
 	}
 
@@ -113,16 +114,16 @@ public class NewsController extends BaseController {
 			modelview.addObject("banners", banners);
 		}
 	}
-	
-	private Integer getPageNo(String pageNo){
+
+	private Integer getPageNo(String pageNo) {
 		if (StringUtils.isNumeric(pageNo)) {
 			Integer pn = Integer.parseInt(pageNo);
 			return pn < 1 ? 1 : pn;
 		}
 		return 1;
 	}
-	
-	private Integer getPageSize(String pageSize){
+
+	private Integer getPageSize(String pageSize) {
 		if (StringUtils.isNumeric(pageSize)) {
 			Integer ps = Integer.parseInt(pageSize);
 			return ps > 50 ? 50 : (ps < 5 ? 5 : ps);

+ 25 - 16
src/main/java/com/goafanti/news/service/NewsService.java

@@ -5,11 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
 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;
@@ -32,9 +31,11 @@ import com.goafanti.news.bo.NewsSummary;
 public class NewsService extends BaseMybatisDao<NewsMapper> {
 	@Autowired
 	NewsMapper					newsMapper;
+	@Value("${spring.profiles.active}")
+	private String				env;
 
 	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>();
@@ -54,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);
 	}
 
@@ -80,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);
@@ -120,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);
 		}
 
@@ -142,24 +149,26 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 	public int batchDeleteByPrimaryKey(List<String> id) {
 		return newsMapper.batchDeleteByPrimaryKey(id);
 	}
-	
-	@Cacheable(value = "NewsPortalListCache", key = "'NewsPortalList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName")
-	public List<NewsPortalList> findPortalList(Integer pSize, Integer pNo, Integer type,String domainName) {
+
+	@Cacheable(value = "NewsPortalListCache", key = "'NewsPortalList:Page:'+#pNo+'Type:'+#type+'Size:'+#pSize+'domainName:'+#domainName")
+	public List<NewsPortalList> findPortalList(Integer pSize, Integer pNo, Integer type, String domainName) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("type", type);
 		params.put("pageSize", pSize);
 		params.put("pageNo", pNo);
-		params.put("website", domainName);
+		if (!StringUtils.equals(env, "dev") && !StringUtils.equals(env, "local")) {
+			params.put("website", domainName);
+		}
 		return newsMapper.findPortalList(params);
 	}
-	
+
 	@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);

+ 43 - 0
src/main/java/com/goafanti/portal/controller/PortalMemberController.java

@@ -0,0 +1,43 @@
+package com.goafanti.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.memberGrade.bo.MemberGrade;
+import com.goafanti.memberGrade.bo.MemberGradeBO;
+import com.goafanti.memberGrade.service.MemberGradeService;
+/**
+ * 不用登录查询
+ * @author Administrator
+ *
+ */
+@RestController
+@RequestMapping(value = "/api/portal/member")
+public class PortalMemberController extends BaseApiController {
+	@Autowired
+	private MemberGradeService memberGradeService;
+
+	/**
+	 * 查询等级
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberGradeFr", method = RequestMethod.GET)
+	public Result selectMemberGradeFr() {
+		List<MemberGrade> list = memberGradeService.selectMemberGrade();
+		List<MemberGradeBO> result = new ArrayList<>();
+		for (MemberGrade mg : list) {
+			result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
+					JSON.parseObject(mg.getCost()), mg.getMemberRank()));
+		}
+		return res().data(result);
+	}
+}

+ 8 - 0
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -18,6 +18,7 @@ import com.goafanti.achievement.bo.InputAchievementOrder;
 import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.achievement.service.AchievementOrderService;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.activityUser.service.ActivityUserService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
@@ -58,6 +59,13 @@ public class PortalOrderApiController extends CertifyApiController {
 	private AchievementOrderLogService	achievementOrderLogService;
 	@Resource
 	private AchievementOrderService		achievementOrderService;
+	@Resource
+	private ActivityUserService			activityUserService;
+
+	@RequestMapping(value = "/activity", method = RequestMethod.GET)
+	public Result getUserActivityList() {
+		return res().data(activityUserService.selectUserActivities());
+	}
 
 	/**
 	 * 科技成果Log

+ 10 - 0
src/main/java/com/goafanti/user/bo/InterestUserListBo.java

@@ -13,6 +13,8 @@ public class InterestUserListBo {
 
 	private String	username;
 
+	private Long	number;
+
 	private String	unitName;
 
 	private String	userProvince;
@@ -139,4 +141,12 @@ public class InterestUserListBo {
 
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }

+ 10 - 0
src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java

@@ -9,6 +9,8 @@ public class OrgPartnerDetailBo {
 
 	private Integer	area;
 
+	private Long	number;
+
 	private Integer	level;
 
 	private String	abilityLabel;
@@ -111,4 +113,12 @@ public class OrgPartnerDetailBo {
 		this.companyIntroduction = companyIntroduction;
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }

+ 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;
 	}

+ 10 - 0
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -5,6 +5,8 @@ public class UserPartnerDetailBo {
 
 	private Integer	province;
 
+	private Long	number;
+
 	private Integer	city;
 
 	private Integer	area;
@@ -111,4 +113,12 @@ public class UserPartnerDetailBo {
 		this.lifePhotoUrl = lifePhotoUrl;
 	}
 
+	public Long getNumber() {
+		return number;
+	}
+
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+
 }

+ 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
 

+ 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>

File diff suppressed because it is too large
+ 59 - 53
src/main/webapp/WEB-INF/views/common.html


+ 14 - 39
src/main/webapp/WEB-INF/views/portal/membership.html

@@ -24,48 +24,23 @@
 		<div class="member-text">根据企业所需选择合适的付费方案,更高效地为您提供服务</div>
 		<div class="member-card">
 			<ul id="member-list" class="clearfix">
-				<li>
-					<div class="level level1">黄金会员</div>
-					<div class="top">
-						<i class="topImg"></i>
-						<span>提供的专属服务</span>
-					</div>
-					<div class="server">
-						<p>科技成果,专家信息定点推送</p>
-						<p>查看专家的联系方式</p>
-						<p>任何业务申请,付费业享受会员专属折扣。</p>
-						<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
-						<p>一对一的科技咨询师服务</p>
-					</div>
-					<div class="money">
-						<p><a href="">800/3月</a></p>
-						<p><a href="">1400/6月</a></p>
-						<p><a href="">2000/12月</a></p>
-					</div>
-				</li>
-				<li>
-					<div class="level level2">钻石会员</div>
-					<div class="top">
-						<i class="topImg"></i>
-						<span>提供的专属服务</span>
+			</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="server">
-						<p>科技成果,专家信息定点推送</p>
-						<p>查看专家的联系方式</p>
-						<p>任何业务申请,付费业享受会员专属折扣。</p>
-						<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
-						<p>一对一的科技咨询师服务</p>
-						<p>一对一的专业技术顾问,搜集技术情报,提供研发高参</p>
-						<p>免费参加现场业务培训会</p>
-						<p>免前期费用做科技类扶持资金项目申报</p>
+					<div class="modal-body" id="modal-content">
 					</div>
-					<div class="money">
-						<p><a href="">2000/3月</a></p>
-						<p><a href="">3500/6月</a></p>
-						<p><a href="">5000/12月</a></p>
+					<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>
-				</li>
-			</ul>
+				</div>
+			</div>
 		</div>
 	</div>
 	<footer>