anderx 7 éve%!(EXTRA string=óta)
szülő
commit
6bfe33d69a

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -57,7 +57,7 @@ import com.goafanti.user.service.UserInterestService;
 import com.goafanti.user.service.UserService;
 
 @RestController
-@RequestMapping(path = "/app/user", method = RequestMethod.GET)
+@RequestMapping(value = "/app/user")
 public class AppUserController extends BaseApiController {
 	@Resource
 	private UserService userServiceImpl;

+ 1 - 1
src/main/java/com/goafanti/app/controller/OpenAppUserController.java

@@ -22,7 +22,7 @@ import com.goafanti.user.service.UserInterestService;
 import com.goafanti.user.service.UserService;
 
 @RestController
-@RequestMapping(path = "/open/app/user", method = RequestMethod.GET)
+@RequestMapping(value = "/open/app/user")
 public class OpenAppUserController extends BaseApiController {
 	@Resource
 	private UserService userServiceImpl;

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

@@ -755,10 +755,10 @@
 			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>
 		<if test="startDate != null">
-			and a.create_time <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
+			and a.release_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
 		</if>
 		<if test="endDate != null">
-			and a.create_time <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
+			and a.release_date <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
 		</if>
 		<if test="name != null">
 			and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')
@@ -789,10 +789,10 @@
 			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>
 		<if test="startDate != null">
-			and a.create_time <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
+			and a.release_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
 		</if>
 		<if test="endDate != null">
-			and a.create_time <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
+			and a.release_date <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
 		</if>
 		<if test="name != null">
 			and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')

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

@@ -593,7 +593,7 @@
 	  	<if test="isHot != null">
 	  		and is_hot = #{isHot,jdbcType=INTEGER}
 	  	</if>
-	  	order by release_date
+	  	order by release_date desc
 	  	limit #{size,jdbcType=INTEGER}
   </select>
   
@@ -629,7 +629,7 @@
   <if test="module!=null">
   left join jt_business_category jtbc1 on jtbc1.id = jtbp.category_id
   </if>
-  left join (select count(0) as dealCount ,commodity_id from jt_order_detail group by commodity_id) dct on jtbp.id=dct.commodity_id
+  left join (select sum(commodity_quantity) as dealCount ,commodity_id from jt_order_detail group by commodity_id) dct on jtbp.id=dct.commodity_id
   where 1=1
   <if test="module !=null">
   and jtbc1.module=#{module,jdbcType=INTEGER}

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

@@ -341,6 +341,7 @@
   from jt_commodity_comment jcc
   left join user u on jcc.uid=u.id
   where jcc.commodity_id=#{commodityId,jdbcType=VARCHAR}
+  order by jcc.create_time desc
   <if test="page_sql!=null">
 			${page_sql}
 		</if>

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

@@ -671,7 +671,7 @@
 			<if test="resourceType != null">
 				and b.resource_type = #{resourceType,jdbcType=INTEGER}
 			</if>
-			order by b.create_time DESC
+			order by isRead,b.create_time DESC
 			<if test="page_sql!=null">
 				${page_sql}
 			</if>

+ 5 - 5
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -319,7 +319,8 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 
 	@Override
 	public int updateMessageConsumer(String messageId) {
-		return messageFromSystemMapper.updateMessageConsumer(messageId, TokenManager.getUserId() , new Date());
+//		return messageFromSystemMapper.updateMessageConsumer(messageId, TokenManager.getUserId() , new Date());
+		return messageFromSystemMapper.updateMessageConsumer(messageId, "71a05e9c-a392-480d-817e-678be136cddc" , new Date());
 	}
 
 	@SuppressWarnings("unchecked")
@@ -363,13 +364,12 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	@Override
 	public Pagination<MessageListBo> listPersonalMessage(Integer subject, Integer resourceType,Integer pageNo,Integer pageSize) {
 			Map<String,Object> params = new HashMap<String, Object>();
-			if(subject == SubjectType.KE_HU.getTypeCode() || subject == SubjectType.TUI_JIAN.getTypeCode()){
-			if(null != subject) params.put("subject", subject);
+//			if(subject == SubjectType.KE_HU.getTypeCode() || subject == SubjectType.TUI_JIAN.getTypeCode()){
+//			if(null != subject) params.put("subject", subject);
 			if(null != resourceType) params.put("resourceType", resourceType);
 			params.put("uid", TokenManager.getUserId());
+//			params.put("uid","71a05e9c-a392-480d-817e-678be136cddc");
 			return (Pagination<MessageListBo>)findPage("listPersonalMessageByPage", "listPersonalMessageCount", params, pageNo, pageSize);
-		}
-		return null;
 	}
 
 	@Override