nyx javaapp: 功能&页面更新

1. 活动发布: 多商户时添加商户选择功能

增值产品-小程序及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;
@@ -760,8 +760,8 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
         Rockwell_keyV_member_userQuery rockwell_keyV_member_userQuery = new Rockwell_keyV_member_userQuery();
         Rockwell_keyV_member_userQuery rockwell_keyV_member_userQuery = new Rockwell_keyV_member_userQuery();
 
 
         //判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
         //判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
-        //默认设置 member_userStatus == "01"
-        //默认设置 end_datetime >= NOW()
+        //默认设置 member_user Status == "01"
+        //userId 和 memberId必须有一个
         if((StringUtils.isEmpty(userId) || userId.equals("0")) && (StringUtils.isEmpty(memberId) || memberId.equals("0")))
         if((StringUtils.isEmpty(userId) || userId.equals("0")) && (StringUtils.isEmpty(memberId) || memberId.equals("0")))
         {
         {
             return new JSONResult(ExceptionMsg.ParamError);
             return new JSONResult(ExceptionMsg.ParamError);

增值产品-小程序及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;
@@ -548,7 +548,8 @@ public class NyxApiController {
     // 7.1 user/member 的相关查询
     // 7.1 user/member 的相关查询
     // 1. 按照 user_id
     // 1. 按照 user_id
     // 2. 按照 member_id
     // 2. 按照 member_id
-    // collect_status == '01' && end_datetime >= NOW()
+    // status == '01' && member_status == '01'
+    // order by default_member desc, create_datetime asc
     // 返回 Rockwell_keyV_member_user
     // 返回 Rockwell_keyV_member_user
     @ApiOperation(value="获取商家用户视图的信息", notes="获取商家用户视图的信息")
     @ApiOperation(value="获取商家用户视图的信息", notes="获取商家用户视图的信息")
     @ApiImplicitParams({
     @ApiImplicitParams({
@@ -557,7 +558,7 @@ public class NyxApiController {
             @ApiImplicitParam(name = "pageNum", value = "页码，从1开始", required = false, dataType = "String", defaultValue = "1"),
             @ApiImplicitParam(name = "pageNum", value = "页码，从1开始", required = false, dataType = "String", defaultValue = "1"),
             @ApiImplicitParam(name = "pageCount", value = "每页的数据个数，默认是4个", required = false, dataType = "String", defaultValue = "4")
             @ApiImplicitParam(name = "pageCount", value = "每页的数据个数，默认是4个", required = false, dataType = "String", defaultValue = "4")
     })
     })
-    @RequestMapping(value = "/nyx/member/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/nyx/user/member/query", method = RequestMethod.GET)
     public JSONResult RockwellQueryMember(
     public JSONResult RockwellQueryMember(
             @RequestParam(value = "userId", required = false, defaultValue = "0") String userId,
             @RequestParam(value = "userId", required = false, defaultValue = "0") String userId,
             @RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
             @RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,

增值产品-小程序及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"?>
@@ -550,12 +550,17 @@ limitations under the License.
         AND member_status="01"
         AND member_status="01"
         AND status="01"
         AND status="01"
         <if test="userId != null and userId != '' ">
         <if test="userId != null and userId != '' ">
+            AND openid=
+            (
+            SELECT openid FROM view_member_user
+            WHERE 1=1
             AND user_id=#{userId}
             AND user_id=#{userId}
+            )
         </if>
         </if>
         <if test="memberId != null and memberId != '' ">
         <if test="memberId != null and memberId != '' ">
             AND member_id=#{memberId}
             AND member_id=#{memberId}
         </if>
         </if>
-        order by default_member desc
+        order by default_member desc, create_datetime desc
         <if test="pagination != null ">
         <if test="pagination != null ">
             <include refid="pagination"/>
             <include refid="pagination"/>
         </if>
         </if>