Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.0.2</version>
+	<version>v0.1.0</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -92,6 +92,12 @@ public class CommConstant {
      * 未领取
      */
     public static final Integer STATUS_UNACCALIMED = 0;
+    
+    /**
+     * 成功
+     */
+    public static final String SUCCESS = "success";
+
 
 
     /**

src/main/java/com/huiju/estateagents/controller/TaCheckinController.java

@@ -54,8 +54,9 @@ public class TaCheckinController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
-    public ResponseBean taCheckinList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,String activity){
+    public ResponseBean taCheckinList(@PathVariable String activity,
+                                      @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -78,8 +79,8 @@ public class TaCheckinController extends BaseController {
      * @param activity 实体对象
      * @return
      */
-    @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.POST)
-    public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
+    @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
+    public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

@@ -213,7 +213,11 @@ public class TaGoodsController extends BaseController {
             String openid = JWTUtils.getSubject(request);
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
-            responseBean.addSuccess(null);
+            if (state.equals(CommConstant.SUCCESS)){
+                responseBean.addSuccess("兑换成功");
+            }else{
+                responseBean.addError(state);
+            }
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taGoodsGet -=- {}",e.toString());

src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java

@@ -174,8 +174,8 @@ public class TaPointsRecordsController extends BaseController {
             //使用分页插件
             IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPerson.getPersonId());
             queryWrapper.orderByDesc("create_date");
-            queryWrapper.like("change_params","%\""+taPerson.getPersonId()+"\"%");
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

@@ -74,7 +74,7 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		//商品数减少
 		taGoods.setTotalNum(taGoods.getTotalNum() -1);
 		taGoodsMapper.updateById(taGoods);
-		return "success";
+		return CommConstant.SUCCESS;
 	}
 	
 	/**

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8001
 spring:
   application:
     name: estateagents

src/main/resources/mapper/TaCheckinMapper.xml

@@ -11,7 +11,7 @@
         AND activity = #{activity}
     </select>
 
-    <select id="isCustomerChecked" resultType="com.huiju.estateagents.entity.TaCheckin">
+    <select id="isCustomerChecked" resultType="int">
         SELECT
         count(1)
         FROM