Browse Source

Accept Merge Request #288 更新生产 : (test -> prod)

Merge Request: 更新生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/288
浅川 8 years ago
parent
commit
ad671f08b0
34 changed files with 301 additions and 88 deletions
  1. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  2. 4 1
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 5 2
      src/main/java/com/goafanti/app/bo/HomeImages.java
  4. 33 0
      src/main/java/com/goafanti/app/controller/AppOrderController.java
  5. 2 2
      src/main/java/com/goafanti/app/controller/OpenAppDiscoveryController.java
  6. 0 2
      src/main/java/com/goafanti/app/controller/OpenAppHomeController.java
  7. 3 3
      src/main/java/com/goafanti/common/controller/WebpageController.java
  8. 1 1
      src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java
  9. 1 0
      src/main/java/com/goafanti/common/dao/TOrderBillMapper.java
  10. 8 0
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  11. 6 4
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  12. 1 1
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  13. 2 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  14. 32 7
      src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml
  15. 30 3
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  16. 4 4
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  17. 3 2
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  18. 3 1
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  19. 1 1
      src/main/java/com/goafanti/demand/service/DemandService.java
  20. 4 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  21. 5 1
      src/main/java/com/goafanti/marketing/service/MarketingManagementService.java
  22. 8 3
      src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java
  23. 33 0
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  24. 21 0
      src/main/java/com/goafanti/order/service/OrderService.java
  25. 42 22
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  26. 14 7
      src/main/java/com/goafanti/portal/controller/PortalSearchController.java
  27. 15 9
      src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java
  28. 4 1
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  29. 1 1
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  30. 1 1
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  31. 4 2
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  32. 6 3
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  33. 1 1
      src/main/webapp/WEB-INF/views/common.html
  34. 2 0
      src/main/webapp/WEB-INF/views/portal/index.html

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -53,7 +53,7 @@ public interface AchievementService {
 
 	void insertImport(List<AchievementImportBo> data);
 
-	Pagination<AchievementSearchListBo> listAchievementSearchList(
+	Pagination<AchievementSearchListBo> listAchievementSearchList(String url,
 			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
 			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
 

+ 4 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -519,10 +519,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementSearchListBo> listAchievementSearchList(String keyword, Integer dataCategory,
+	public Pagination<AchievementSearchListBo> listAchievementSearchList(String url,String keyword, Integer dataCategory,
 			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
 			String upperPrice, String lowerPrice,Integer internationalFlag) {
 		Map<String, Object> params = new HashMap<>();
+		if (!StringUtils.isBlank(url)) {
+			params.put("url", url);
+		}
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 		}

+ 5 - 2
src/main/java/com/goafanti/app/bo/HomeImages.java

@@ -10,12 +10,15 @@ public class HomeImages {
 	
 	public String img3="/customer_sys_file/1/GG3.jpg";
 	
+	public String img4="/customer_sys_file/1/GG4.jpg";
+	
 	private List<HomeImgBo> imagers=new ArrayList<>();
 	
 	public  List<HomeImgBo> getImagers() {
 		imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1,"成果"));
-		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img1,"需求"));
-		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img1,"专家"));
+		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img2,"需求"));
+		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img3,"专家"));
+		imagers.add(new HomeImgBo(null,img4,null));
 		return imagers;
 	}
 	

+ 33 - 0
src/main/java/com/goafanti/app/controller/AppOrderController.java

@@ -220,4 +220,37 @@ public class AppOrderController extends CertifyApiController{
 		orderServiceImpl.updateConfirmIntention(orderNo,confirm);
 		return res;
 	}
+	
+	/**
+	 * 申请退款
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/applyForRefund",method = RequestMethod.POST)
+	public Result applyForRefund(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		orderServiceImpl.updateApplyForRefund(orderNo);
+		return res;
+	}
+	
+	/**
+	 * 确认退款
+	 * @param orderNo
+	 * @param confirm
+	 * @return
+	 */
+	@RequestMapping(value = "/confirmRefund", method = RequestMethod.POST)
+	public Result confirmRefund(String orderNo,boolean confirm){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
+		return res;
+	}
 }

+ 2 - 2
src/main/java/com/goafanti/app/controller/OpenAppDiscoveryController.java

@@ -15,7 +15,7 @@ import com.goafanti.demand.service.DemandService;
 import com.goafanti.user.service.UserIdentityService;
 
 @RestController
-@RequestMapping(path = "open/app/discovery", method = RequestMethod.GET)
+@RequestMapping(path = "/open/app/discovery", method = RequestMethod.GET)
 public class OpenAppDiscoveryController extends BaseApiController {
 	@Resource
 	private AchievementService	achievementService;
@@ -90,7 +90,7 @@ public class OpenAppDiscoveryController extends BaseApiController {
 	@RequestMapping(value = "/expertsList", method = RequestMethod.GET)
 	public Result expertsList(String industry, Integer pNo, Integer pSize) {
 		Result res = new Result();
-		res.setData(userIdentityService.expertsList(industry,  pNo,  pSize));
+		res.setData(userIdentityService.expertsList(industry,pNo,pSize));
 		return res;
 	}
 	

+ 0 - 2
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -22,8 +22,6 @@ public class OpenAppHomeController extends BaseApiController{
 	@RequestMapping(value = "/getHomePageData", method = RequestMethod.GET)
 	public Result getHomePageData(HttpServletRequest  request){
 		Result res = new Result();
-		String basePath = request.getServerName();
-		System.out.println("basePath:-------------------"+basePath);
 		res.setData(appHomePageService.getAppHomePage());
 		return res;
 	}

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

@@ -231,11 +231,11 @@ public class WebpageController extends BaseController {
 		}
 		//modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
-		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
-		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType());
-		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(
+		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(request,
 				MarketingPage.specialist.getPageUrl(), MarketingPage.specialist.getBoothType());
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);

+ 1 - 1
src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java

@@ -125,5 +125,5 @@ public interface MarketingManagementMapper {
 	 * @param category
 	 * @return
 	 */
-	List<MarketingManagementBo> selectMarketList(@Param("showPage")String showPage, @Param("category")Integer category);
+	List<MarketingManagementBo> selectMarketList(@Param("url")String url,@Param("showPage")String showPage, @Param("category")Integer category);
 }

+ 1 - 0
src/main/java/com/goafanti/common/dao/TOrderBillMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderBill;
 import com.goafanti.common.model.TOrderBillExample;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 8 - 0
src/main/java/com/goafanti/common/dao/TOrderMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.common.model.TOrderExample;
 import com.goafanti.order.bo.BillDetailBo;
+import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 
@@ -125,4 +126,11 @@ public interface TOrderMapper {
 	 */
 	BillDetailBo selectBillDetail(String billNo);
 
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	List<BillListBo> selectBillByOrderNo(String orderNo);
+
 }

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

@@ -1321,14 +1321,15 @@
   		a.transfer_mode as transferMode,
   		a.technical_picture_url as technicalPictureUrl,
   		b.name as fieldAs,
-  		ap.publish_page,ap.publish_platform,ap.publish_client,ap.if_top,ap.top_number,ap.show_number
+  		ap.publish_page,ap.publish_platform,ap.publish_client,ap.if_top,ap.top_number,ap.show_number,bi.domain_name
   	from achievement a 
   	right join achievement_publish ap on a.id=ap.achievement_id
+  	left join branch_information bi on bi.id=ap.publish_platform
   	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
 	and ap.publish_page='W02'
-	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+	and bi.domain_name like '%#{url,jdbcType=VARCHAR}%'
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>
@@ -1368,13 +1369,14 @@
   <select id="findSearchAchievementCount" parameterType="String" resultType="java.lang.Integer">
   	select 
   		count(1)
-  	from achievement a 
+  from achievement a 
   	right join achievement_publish ap on a.id=ap.achievement_id
+  	left join branch_information bi on bi.id=ap.publish_platform
   	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
 	and ap.publish_page='W02'
-	and ap.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+	and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>

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

@@ -790,7 +790,7 @@
  </select>
  
  <select id="selectBusinessProjectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
- 	select  id,bname,ifnull(price,0)*10000 as price,ifnull(first_payment,0)*10000 as firstPayment from business_project 
+ 	select  id,bname,ifnull(price,0) as price,ifnull(first_payment,0) as firstPayment from business_project 
  	where 1=1
  	<if test="cid != null">
  		and cid = #{cid,jdbcType=VARCHAR}

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

@@ -1051,11 +1051,12 @@
 	  	 	u.lvl as level,dp.publish_page,dp.publish_platform,dp.publish_client,dp.if_top,dp.top_number,dp.show_number
   		from demand d
   		right join demand_publish dp on d.id=dp.demand_id
+  		left join branch_information bi on bi.id=dp.publish_platform
   		left join user u on u.id = d.employer_id
   		where d.deleted_sign = 0 and d.status = 0
   		and dp.publish_client=0
 		and dp.publish_page='W02'
-		and dp.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+		and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
 		<if test="keyword != null">
   			and d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		</if>

+ 32 - 7
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -353,26 +353,51 @@
   </select>
   <select id="selectMarketList" resultType="com.goafanti.marketing.bo.MarketingManagementBo">
   	<if test="category == 1"> <!-- 成果 -->
-  		select mm.product_id as productId,x.owner_type as ownerType,x.summary,x.name,mm.cover_img as coverImg
-		from marketing_management mm left join achievement x on mm.product_id = x.id
-		where mm.effective =1 and x.audit_status=3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
+  		select
+	x.id,
+	x.owner_type as ownerType,
+	x.summary,
+	x.name,
+	x.technical_picture_url  as coverImg,
+	bi.platform_url
+from
+	 achievement x 
+right join achievement_publish ap on ap.achievement_id=x.id
+left join branch_information bi on bi.id=ap.publish_platform
+where x.audit_status = 3
+	and x.deleted_sign = 0
+	and ap.publish_client='0'
+	and ap.publish_page='W01'
+	and bi.platform_url like "%"#{url,jdbcType=VARCHAR}"%"
   	</if>
   	<if test="category == 2"> <!-- 需求 -->
-  		select mm.product_id as productId,x.data_category as ownerType,x.name,mm.cover_img as coverImg,x.problem_des
-		from marketing_management mm left join demand x on mm.product_id = x.id
-		where mm.effective =1  and x.audit_status =3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
+  		select x.id as productId,x.data_category as ownerType,x.name,x.picture_url as coverImg,x.problem_des
+		from    demand x 
+		right join demand_publish dp on dp.demand_id=x.id
+		left join branch_information bi on bi.id=dp.publish_platform
+		where  x.audit_status =3 and x.deleted_sign = 0
+			and x.deleted_sign = 0
+	and dp.publish_client='0'
+	and dp.publish_page='W01'
+	and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
   	</if>
   	<if test="category == 7"> <!-- 智者 -->
   		select 
   		u.id,i.username,ua.ability_label as abilityLabel,
-  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type
+  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert 
   		from `user` u
   		left join user_ability ua on u.id=ua.uid
   		left join user_career c on u.id=c.uid
   		left join user_identity i on u.id=i.uid
+  		right join expert_publish ep on ep.expert_id=u.id
+  		left join branch_information bi on bi.id=ep.publish_platform
   		WHERE
 		u.type = 0 and 
 		i.expert = 1	
+		and ep.publish_client='0'
+		and ep.publish_page='W01'
+		and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
+		
   	</if>
   </select>
 </mapper>

+ 30 - 3
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1344,9 +1344,6 @@
 		<if test="financeName != null and financeName != ''">
 			and d.name =  #{financeName,jdbcType=VARCHAR}
 		</if>
-		<if test="page_sql != null">
-			${page_sql}
-		</if>
   </select>
   <select id="selectBillByPage" resultType="com.goafanti.order.bo.BillListBo">
 	select
@@ -1583,4 +1580,34 @@
 			${page_sql}
 		</if>
   </select>
+  
+  <select id="selectBillByOrderNo" parameterType="java.lang.String" resultType="com.goafanti.order.bo.BillListBo">
+  	select
+		a.bill_no as billNo,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
+		a.transaction_amount as transactionAmount,
+		a.transaction_channel as transactionChannel,
+		a.transaction_subject as transactionSubject,
+		a.transaction_mode as transactionMode,
+		a.financial_pay_no as financialPayNo,
+		date_format(a.financial_pay_time,'%Y-%m-%d %H:%i:%S') as financialPayTime,
+		a.confirm_sign as confirmSign,
+		a.delete_sign as deleteSign,
+		date_format(a.confirm_time,'%Y-%m-%d %H:%i:%S') as confirmTime,
+		b.order_no as orderNo,
+		c.nickname as payeeName,
+		d.nickname as payerName,
+		e.name as financeName,
+		f.name as salesmanName,
+		g.name as departmentName
+	from
+		t_order_bill a left join t_order b on
+		a.order_no = b.order_no left join user c on 
+		a.payee_id = c.id left join user d on
+		a.payer_id = d.id left join admin e on 
+		b.finance_id = e.id left join admin f on 
+		b.salesman_id = f.id left join department_management g on
+		f.department_id = g.id
+	where a.order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -917,17 +917,17 @@
 			ui.international,
 			ep.publish_page,ep.publish_platform,ep.publish_client,ep.if_top,ep.top_number,ep.show_number
 		FROM
-			<![CDATA[ user ]]> u
+		 user  u
 		right join expert_publish ep on u.id=ep.expert_id
+		left join branch_information bi on bi.id=ep.publish_platform
 		LEFT JOIN user_identity ui ON ui.uid = u.id
 		LEFT JOIN user_career uc ON uc.uid = u.id
-		<!-- LEFT JOIN user_info info ON info.uid = u.id -->
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
 			u.type = 0 and ui.expert = 1
-			and ep.publish_client=0
+		and ep.publish_client=0
 		and ep.publish_page='W02'
-		and ep.publish_platform='112461d9-2120-4809-b709-3cb5f5acfcc3'
+		and bi.domain_name like  "%"#{url,jdbcType=VARCHAR}"%"
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>

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

@@ -31,7 +31,7 @@
 		left join industry_category c on b.industry = c.id
 		left join admin d on a.aid = d.id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1	
-		AND b.expert_audit=2
+		AND a.audit_status=1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
@@ -95,7 +95,6 @@
 	</select>
 	<select id="selectPersonalCustomerCount" resultType="java.lang.Integer">
 		select count(0)
-					select count(0)
 			from user a inner join user_identity b on a.id = b.uid
 		left join district_glossory dg1 on b.province = dg1.id
 		left join district_glossory dg2 on b.city = dg2.id
@@ -913,6 +912,8 @@
 		left join admin d on a.aid = d.id
 		LEFT JOIN department_management dm on dm.id = d.department_id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1
+		AND a.audit_status=1
+		and a.share_type =0
 		<if test="aid != null and aid !=''">
 			and (a.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
 		</if>

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

@@ -97,7 +97,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public Pagination<CustomerListOut> listPublicPersonalCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
-		/*cli.setAid(TokenManager.getAdminId());*/
+		cli.setAid(TokenManager.getAdminId());
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PUBLIC));
 		Map<String,Object> params = disposeParams(cli);
 		@SuppressWarnings("unchecked")
@@ -108,6 +108,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public Pagination<CustomerListOut> listAllPersonalCustomer(CustomerListIn cli, Integer pageNo, Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
+		cli.setAid(TokenManager.getAdminId());
+		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 		Map<String,Object> params = disposeParams(cli);
 		if(null!=cli.getExpertAudit())params.put("expertAudit", cli.getExpertAudit());
 		@SuppressWarnings("unchecked")

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -57,7 +57,7 @@ public interface DemandService {
 
 	void insertImport(List<DemandImportBo> data);
 
-	Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
+	Pagination<DemandSearchListBo> listDemandSearchList(String url,Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize,Integer dateSort);
 

+ 4 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -482,10 +482,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
+	public Pagination<DemandSearchListBo> listDemandSearchList(String url,Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer pNo, Integer pSize, Integer dateSort) {
 		Map<String, Object> params = new HashMap<>();
+		if (!StringUtils.isBlank(url)) {
+			params.put("url", url);
+		}
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 		}

+ 5 - 1
src/main/java/com/goafanti/marketing/service/MarketingManagementService.java

@@ -2,6 +2,10 @@ package com.goafanti.marketing.service;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpRequest;
+
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 
@@ -47,5 +51,5 @@ public interface MarketingManagementService {
 	 * @param category 分类
 	 * @return
 	 */
-	public List<MarketingManagementBo> selectMarketList(String showPage,Integer category);
+	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage,Integer category);
 }

+ 8 - 3
src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java

@@ -3,6 +3,9 @@ package com.goafanti.marketing.service.impl;
 import java.util.List;
 import java.util.UUID;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,8 +45,10 @@ public class MarketingManagementServiceImpl implements MarketingManagementServic
 	}
 
 	@Override
-	public List<MarketingManagementBo> selectMarketList(String showPage, Integer category) {
-		return marketingManagementMapper.selectMarketList(showPage, category);
+	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage, Integer category) {
+		String url=res.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
+		return marketingManagementMapper.selectMarketList(url,showPage, category);
 	}
-
+	
 }

+ 33 - 0
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -554,4 +554,37 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateLockOrRevokeOrder(orderNo,operatorType);
 		return res;
 	}
+
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value= "/getBillByOrderNo", method = RequestMethod.GET)
+	public Result getBillByOrderNo(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectBillByOrderNo(orderNo));
+		return res;
+	}
+	
+	/**
+	 * 确认退款
+	 * @param orderNo
+	 * @param confirm
+	 * @return
+	 */
+	@RequestMapping(value = "/confirmRefund", method = RequestMethod.GET)
+	public Result confirmRefund(String orderNo,boolean confirm){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
+		return res;
+	}
 }

+ 21 - 0
src/main/java/com/goafanti/order/service/OrderService.java

@@ -399,4 +399,25 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateLockOrRevokeOrder(String orderNo, Integer operatorType);
+
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	List<BillListBo> selectBillByOrderNo(String orderNo);
+
+	/**
+	 * 申请退款(买家)
+	 * @param orderNo
+	 * @return
+	 */
+	int updateApplyForRefund(String orderNo);
+
+	/**
+	 * 确认退款(买家)
+	 * @param orderNo
+	 * @return
+	 */
+	int updateConfirmRefund(String orderNo,boolean confirm);
 }

+ 42 - 22
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -90,7 +90,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
 	private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
 	private final String DEFAULT_CREATER = "PLATFORM";//平台方
-	private final BigDecimal DEFAULT_AMOUNT_UNIT = new BigDecimal(10000); //单位
 	/*
 	 * -------------------------------------------------- APP管理端 --------------------------------------------------------
 	 */
@@ -162,10 +161,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderDetail.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
 		tOrderDetail.setCommodityType(commodityType);
 		tOrderDetail.setCommodityQuantity(commodityQuantity);
-		tOrderDetail.setCommodityPrice(commodityPrice.multiply(DEFAULT_AMOUNT_UNIT));
-		tOrderDetail.setCommodityFirstPayment(commodityFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
-		tOrderDetail.setDiscountPrice(discountPrice.multiply(DEFAULT_AMOUNT_UNIT));
-		tOrderDetail.setDiscountFirstPayment(discountFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
+		tOrderDetail.setCommodityPrice(commodityPrice);
+		tOrderDetail.setCommodityFirstPayment(commodityFirstPayment);
+		tOrderDetail.setDiscountPrice(discountPrice);
+		tOrderDetail.setDiscountFirstPayment(discountFirstPayment);
 		tOrderDetail.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
 		tOrderDetailMapper.insert(tOrderDetail);
 		tOrderMapper.insert(tOrder);
@@ -251,16 +250,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
 			}
 		}else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请 
-			if(tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode() 
-					&& tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode()
-					&& tOrder.getActuallyTotalAmount().doubleValue() > 0){
+			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode() 
+					|| tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()
+					|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"等待提现"));
 			}
 			tOrder.setLiquidationStatus(LiquidationState.WAIT_FOR_WITHDRAW.getCode());
 		}else if(orderAction == OrderAction.CONFIRM_WITHDRAW){ //提现确认 (审核员先审核流水)
-			if(tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode() 
-					&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
-					&& tOrder.getActuallyTotalAmount().doubleValue() > 0){
+			if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode() 
+					|| tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_WITHDRAW.getCode()
+					|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
 				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认提现"));
 			}
 			tOrder.setLiquidationStatus(LiquidationState.ALREADY_WITHDRAW.getCode());
@@ -390,14 +389,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					active.setConfirmIntention(false);
 					active.setRefuseIntention(false);
 				}
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
-						&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
+				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
 					active.setPayForFirst(true); //支付首付
 				} else {
 					active.setPayForFirst(false); //支付首付
 				}
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
-						&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
+				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
 					active.setPayForLast(true); //支付尾款
 				} else {
 					active.setPayForLast(false); //支付尾款
@@ -420,7 +417,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 						&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
 					flag = false;
 				}
-				
 				if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
 						|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
 						|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
@@ -752,15 +748,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	//to update 18
 	public int updateApplyForCancel(String orderNo) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		setOrderState(OrderAction.APPLY_FOR_CANCEL, new BigDecimal(0), tOrder, false);
-		if(true){ //退款
-			BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()); 
-			addFundRecord(orderNo, "平台方", DEFAULT_PLATFORM_ID,TokenManager.getUserId(), "买家取消订单",
-					TransactionSubject.REFUND, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
-		}
 		tOrder.setUpdateTime(new Date());
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
@@ -1297,6 +1287,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
 				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
 					setOrderState(OrderAction.CONFIRM_PAY_FOR_LAST, bill.getTransactionAmount(), order, false);
+				if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode())
+					setOrderState(OrderAction.COMPLETE_REFUND, bill.getTransactionAmount(), order, false);
+				if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode())
+					setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
 				order.setUpdateTime(new Date());
 				tOrderMapper.updateByPrimaryKeySelective(order);
 			}else if(confrim == AFTConstants.NO){
@@ -1503,4 +1497,30 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			return DEFAULT_ADMIN_ID;
 		}
 	}
+
+	@Override
+	public List<BillListBo> selectBillByOrderNo(String orderNo) {
+		return tOrderMapper.selectBillByOrderNo(orderNo);
+	}
+
+	@Override
+	public int updateApplyForRefund(String orderNo) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		setOrderState(OrderAction.APPLY_FOR_REFUND, new BigDecimal(0), tOrder, false);
+		tOrder.setUpdateTime(new Date());
+		return tOrderMapper.updateByPrimaryKey(tOrder);
+	}
+
+	@Override
+	public int updateConfirmRefund(String orderNo,boolean confirm) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		setOrderState(OrderAction.CONFIRM_REFUND, new BigDecimal(0), tOrder, confirm);
+		tOrder.setUpdateTime(new Date());
+		if(confirm){ //同意退款生成退款流水
+			BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()); 
+			addFundRecord(orderNo, "平台方", DEFAULT_PLATFORM_ID,TokenManager.getUserId(), "同意退款系统生成流水",
+					TransactionSubject.REFUND, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
+		}
+		return tOrderMapper.updateByPrimaryKey(tOrder);
+	}
 }

+ 14 - 7
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,12 +43,14 @@ public class PortalSearchController extends BaseController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
+	public Result achievementSearchList(HttpServletRequest req,  String keyword,Integer dataCategory,Integer category,
 			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice,
 			Integer internationalFlag) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 20;
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		if(null != dateSort && dateSort != 0 && dateSort != 1){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "时间排序"));
 		}
@@ -71,7 +74,7 @@ public class PortalSearchController extends BaseController {
 		}
 		
 		
-		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
+		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( url,
 				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);
 		
 		
@@ -110,10 +113,12 @@ public class PortalSearchController extends BaseController {
 	 * 科技需求搜索
 	 */
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
-	public Result demandSearchList(Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
+	public Result demandSearchList(HttpServletRequest req,Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
 			String pageSize,Integer dateSort) {
 		Result res = new Result();
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (null == sign) {
@@ -135,7 +140,7 @@ public class PortalSearchController extends BaseController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.listDemandSearchList(sign, keyword, industryCategoryA, industryCategoryB, demandType,
+		res.setData(demandService.listDemandSearchList(url,sign, keyword, industryCategoryA, industryCategoryB, demandType,
 				budgetCostLower, budgetCostUpper, pNo, pSize,dateSort));
 		return res;
 	}
@@ -144,9 +149,11 @@ public class PortalSearchController extends BaseController {
 	 * 用户搜索
 	 */
 	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
-	public Result subscriberSearchList(String name, Integer level, Integer type, String field, Integer province,
+	public Result subscriberSearchList(HttpServletRequest req,String name, Integer level, Integer type, String field, Integer province,
 			Integer city, Integer area,Integer international, String pageNo, String pageSize) {
 		Result res = new Result();
+		String url=req.getServerName();
+		url=url.substring(url.indexOf(".")+1, url.length());
 		if (null == type) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
 			return res;
@@ -171,9 +178,9 @@ public class PortalSearchController extends BaseController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		if (UserType.PERSONAL.getCode().equals(type)) {
-			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, international, pNo, pSize));
+			res.setData(userIdentityService.listSubscriber(url,name, level, field, province, city, area, international, pNo, pSize));
 		} else {
-			res.setData(organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
+			res.setData(organizationIdentityService.listSubscriber(url,name, level, field, province, city, area, pNo, pSize));
 		}
 		return res;
 	}

+ 15 - 9
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -760,8 +760,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		ContractTask task = techProjectService.selectTaskById(taskId);
 		if(task != null){
-			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode())
+			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode()){
 				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			}
 			task.setId(taskId);
 			task.setTaskReceiver(taskReceiverId);
 			task.setTaskAllocator(TokenManager.getAdminId());
@@ -828,11 +830,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		ContractTask task = techProjectService.selectTaskById(taskId);
 		if(task != null){
-			if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode());
-			res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+			if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode()){
+				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			}
+			task.setTaskStatus(TaskState.STARTED.getCode());
+			techProjectService.updateProjectTask(task);
 		}
-		task.setTaskStatus(TaskState.STARTED.getCode());
-		techProjectService.updateProjectTask(task);
 		return res;
 	}
 	
@@ -850,11 +854,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		ContractTask task = techProjectService.selectTaskById(taskId);
 		if(task != null){
-			if(task.getTaskStatus() != TaskState.STARTED.getCode());
-			res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+			if(task.getTaskStatus() != TaskState.STARTED.getCode()){
+				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			}
+			task.setTaskStatus(TaskState.COMPLETE.getCode());
+			techProjectService.updateProjectTask(task);
 		}
-		task.setTaskStatus(TaskState.COMPLETE.getCode());
-		techProjectService.updateProjectTask(task);
 		return res;
 	}
 	

+ 4 - 1
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -101,7 +101,10 @@ public class UserIdentityBo extends UserIdentity {
 	}
 
 	public String getCountInterest() {
-		return String.valueOf(Integer.valueOf(countInterest)+20);
+		if(countInterest!=null){
+			return String.valueOf(Integer.valueOf(countInterest)+20);
+		}
+		return "20";
 	}
 
 	public void setCountInterest(String countInterest) {

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

@@ -46,7 +46,7 @@ public interface OrganizationIdentityService {
 
 	int updateOrgDetailByAuditAdmin(OrganizationIdentity oi, String aid, String mid, Integer level);
 
-	Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
+	Pagination<OrgSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
 			Integer area, Integer pNo, Integer pSize);
 
 	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);

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

@@ -35,7 +35,7 @@ public interface UserIdentityService {
 
 	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
 
-	Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
+	Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province, Integer city,
 			Integer area,Integer international, Integer pNo, Integer pSize);
 
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);

+ 4 - 2
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -221,10 +221,12 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
+	public Pagination<OrgSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province,
 			Integer city, Integer area, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
-
+		if (StringUtils.isNotBlank(url)) {
+			params.put("url", url);
+		}
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 		}

+ 6 - 3
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -166,10 +166,12 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
+	public Pagination<UserSubscriberListBo> listSubscriber(String url,String name, Integer level, String field, Integer province,
 			Integer city, Integer area, Integer international, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
-
+		if (StringUtils.isNotBlank(url)) {
+			params.put("url", url);
+		}
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 		}
@@ -345,7 +347,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if (pSize == null || pSize < 0 || pSize > 12) {
 			pSize = 10;
 		}
-		Pagination<UserIdentityBo> p=(Pagination<UserIdentityBo>) findPage("findUserIdentityListByPage",
+		
+		Pagination<UserIdentityBo> p= (Pagination<UserIdentityBo>) findPage("findUserIdentityListByPage",
 				"findUserIdentityCount", params, pNo, pSize);
 		
 		return p;

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -372,7 +372,7 @@
 				email : /*[[${adminData.email}]]*/'',
 				createTime : /*[[${adminData.createTime}]]*/'',
 				uid : /*[[${adminData.id}]]*/'',
-				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false
+				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/index.html

@@ -23,6 +23,8 @@
 					th:src="${portalHost+'/img/index_banner04.jpg'}" alt="" /></a></li>
 			 <li data-index=4><a href=""><img
                     th:src="${portalHost+'/img/index_banner05.jpg'}" alt="" /></a></li>
+               <li data-index=5><a href=""><img
+                    th:src="${portalHost+'/img/index_banner06.jpg'}" alt="" /></a></li>
 		</ul>
 		<ul class="ct-img-small clear">