nyx javaapp 更新

1. 调整activity query by id 为 view_activity_detail 数据视图

增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyV_activity_info.java

-package cn.com.fun.nyxkey.api.domain;
+package cn.com.fun.nyxkey.api.domain;
@@ -19,14 +19,25 @@ public class Rockwell_keyV_activity_info{
 	private String memberId; // 活动的id, uuid format
     private String memberName; // 商家名称
 	private String memberSlogan; // 商家slogan
-	
+    private String memberStatus; // 用户状态: 00: 未注册用户; 01: 已注册用户
+
 	private String tag; // 活动的标签
 	private String title; // 活动的标题
     private String numLike; // 针对每条activity的点赞次数，每点一次，则累加
 	private String content; // 活动内容
+    private String quiz; // quiz题目列表, 通过::做间隔,
+    private Double point; // quiz 总的积分
+
+    private String productId; // 活动的id, uuid format
+    private String productDesc; // 类别说明
+    private String productStatus; // 商品状态: 00:非可售 01:可售
+    private String defaultStatus; // 默认标记; 00-非默认; 01-默认
+
+    private Double price; // 价格
+    private int stock; // 库存情况
+
 	private String noteImage; // 该条活动的image列表
-	private String memberStatus; // 用户状态: 00: 未注册用户; 01: 已注册用户
-	
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createDatetime; // 统计周期
     

增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.java

-package cn.com.fun.nyxkey.api.repository;
+package cn.com.fun.nyxkey.api.repository;
@@ -35,7 +35,7 @@ public interface Rockwell_keyMapper {
 
     /* activity api */
     List<Rockwell_keyV_activity_info> getV_activity_info_by_page(Rockwell_keyT_activityQuery rockwell_keyT_activityQuery);
-    List<Rockwell_keyV_activity_info> getV_activity_info_by_id(Rockwell_keyT_activityQuery rockwell_keyT_activityQuery);
+    List<Rockwell_keyV_activity_info> getV_activity_detail_by_id(Rockwell_keyT_activityQuery rockwell_keyT_activityQuery);
 
 
     /* post api */

增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_keyService.java

-package cn.com.fun.nyxkey.api.service;
+package cn.com.fun.nyxkey.api.service;
@@ -45,7 +45,7 @@ public interface Rockwell_keyService {
                                                      String memberId, String memberName, String memberStatus,
                                                      int pageNum, int pageCount);
 
-    JSONResult Rockwell_keyServiceGetV_activity_info_by_id(String activityId);
+    JSONResult Rockwell_keyServiceGetV_activity_detail_by_id(String activityId);
 
     /* post api */
     JSONResult Rockwell_keyServiceGetV_post_info(String tag, String title, String top, int pageNum, int pageCount);

增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java

-package cn.com.fun.nyxkey.api.service.impl;
+package cn.com.fun.nyxkey.api.service.impl;
@@ -290,10 +290,10 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
     }
 
     /* activity api
-    * 通过 activityId 来获取 view_activity_info 的详细信息
+    * 通过 activityId 来获取 view_activity_detail 的详细信息
     *
     *  */
-    public JSONResult Rockwell_keyServiceGetV_activity_info_by_id(String activityId)
+    public JSONResult Rockwell_keyServiceGetV_activity_detail_by_id(String activityId)
     {
         LOGGER.debug("find Rockwell_keyServiceGetV_activity_info_by_id");
 
@@ -308,7 +308,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
         }
         rockwell_keyT_activityQuery.setActivityId(activityId);
 
-        listRockwell_keyV_activity_info = rockwell_keyMapper.getV_activity_info_by_id(rockwell_keyT_activityQuery);
+        listRockwell_keyV_activity_info = rockwell_keyMapper.getV_activity_detail_by_id(rockwell_keyT_activityQuery);
         int totalCount = listRockwell_keyV_activity_info.size();
         JSONResult jsonResult = new JSONResult(totalCount, listRockwell_keyV_activity_info);
         return jsonResult;

增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/NyxApiController.java

-package cn.com.fun.nyxkey.api.web.controller;
+package cn.com.fun.nyxkey.api.web.controller;
@@ -243,6 +243,7 @@ public class NyxApiController {
 
     // APi3 tbl_activity接口 jscat 20200804
     // 3.1 获取 view_activity_info 的数据 by page, not by activityId
+    // 返回 Rockwell_keyV_activity_info
     @ApiOperation(value="获取商家的activity info", notes="获取商家的activity info")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tag", value = "按标签查找; 饮事", required = false, dataType = "String"),
@@ -266,16 +267,17 @@ public class NyxApiController {
         return keyService.Rockwell_keyServiceGetV_activity_info(tag, title, memberId, memberName, memberStatus, pageNum, pageCount);
     }
 
-    // 3.2 获取 view_activity_info 的数据 by activityId
-    @ApiOperation(value="获取商家的activity info by activityId", notes="获取商家的activity info by activityId")
+    // 3.2 获取 view_activity_detail 的数据 by activityId
+    // 返回 Rockwell_keyV_activity_info
+    @ApiOperation(value="获取商家的activity detail信息 by activityId", notes="获取商家的activity detail信息 by activityId")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "activityId", value = "按活动id查找", required = true, dataType = "String")
     })
-    @RequestMapping(value = "/nyx/activity/query/id", method = RequestMethod.GET)
+    @RequestMapping(value = "/nyx/activity/query/detail/id", method = RequestMethod.GET)
     public JSONResult RockwellQueryActivityById(
             @RequestParam(value = "activityId", required = true, defaultValue = "0") String activityId
     ) {
-        return keyService.Rockwell_keyServiceGetV_activity_info_by_id(activityId);
+        return keyService.Rockwell_keyServiceGetV_activity_detail_by_id(activityId);
     }
 
     // 4.0 post info api

增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
@@ -239,14 +239,15 @@ limitations under the License.
         </if>
     </select>
 
-    <!-- activity api 2-2 获取 v_activity_info 的值 by id update jscat 20200805 -->
-    <select id="getV_activity_info_by_id" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
+    <!-- activity api 2-2 获取 view_activity_detail 的值 by id update jscat 20200805 -->
+    <select id="getV_activity_detail_by_id" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_activityQuery"
             resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_activity_info">
-        select * from view_activity_info
+        select * from view_activity_detail
         where 1=1
         <if test="activityId != null and activityId != '' ">
             AND activity_id=#{activityId}
         </if>
+        order by default_status desc, product_id asc;
     </select>
 
     <!-- post api 4.1 从 view_post_info 获取 post信息