Skip to content

N
nyx
Commit c5f29668 by jscat
Options

nyx javaapp: 功能新增 

1. 新增商家功能
parent 27a43f56
正在显示 包含 64 行增加 和 22 行删除
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyV_member_user.java
package cn.com.fun.nyxkey.api.domain; package cn.com.fun.nyxkey.api.domain;
...@@ -25,6 +25,7 @@ public class Rockwell_keyV_member_user{ ...@@ -25,6 +25,7 @@ public class Rockwell_keyV_member_user{
private String memberName; // 名字 private String memberName; // 名字
private String memberAddress; // 地址 private String memberAddress; // 地址
private String AddressName; // 地址 private String AddressName; // 地址
private String AddressStatus; // 默认地址: 00: 否;01:是
private String memberSlogan; // slogan private String memberSlogan; // slogan
private String memberLogo; // logo url private String memberLogo; // logo url
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/query/Rockwell_keyV_member_userQuery.java
package cn.com.fun.nyxkey.api.domain.query; package cn.com.fun.nyxkey.api.domain.query;
...@@ -18,6 +18,7 @@ import java.util.List; ...@@ -18,6 +18,7 @@ import java.util.List;
public class Rockwell_keyV_member_userQuery { public class Rockwell_keyV_member_userQuery {
private String userId; private String userId;
private String memberId; private String memberId;
private String addressStatus;
private Pagination pagination; private Pagination pagination;
//默认返回1页4条记录 //默认返回1页4条记录
...@@ -50,11 +51,24 @@ public class Rockwell_keyV_member_userQuery { ...@@ -50,11 +51,24 @@ public class Rockwell_keyV_member_userQuery {
} }
} }
public void setAddressStatus(String strAddressStatus)
{
if(strAddressStatus.equals("0"))
{
this.addressStatus = null;
}
else
{
this.addressStatus = strAddressStatus;
}
}
@Override @Override
public String toString() { public String toString() {
return "Rockwell_keyV_member_userQuery{" + return "Rockwell_keyV_member_userQuery{" +
"memberId='" + memberId + '\'' + "memberId='" + memberId + '\'' +
"userId='" + userId + '\'' + "userId='" + userId + '\'' +
"addressStatus='" + addressStatus + '\'' +
"pagination='" + pagination + '\'' + "pagination='" + pagination + '\'' +
'}'; '}';
} }
......
增值产品-小程序及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;
...@@ -84,8 +84,8 @@ public interface Rockwell_keyService { ...@@ -84,8 +84,8 @@ public interface Rockwell_keyService {
/* /*
member api member api
*/ */
int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) throws UnsupportedEncodingException; JSONResult Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan, String defaultMember, String addressStatus) throws UnsupportedEncodingException;
JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, int pageNum, int pageCount); JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, String addressStatus, int pageNum, int pageCount);
JSONResult Rockwell_keyServiceUpdateT_member(String memberId, String addressId, String memberSlogan, String memberAddress, String addressStatus); JSONResult Rockwell_keyServiceUpdateT_member(String memberId, String addressId, String memberSlogan, String memberAddress, String addressStatus);
JSONResult Rockwell_keyServiceAddT_address(String memberId, String memberAddress); JSONResult Rockwell_keyServiceAddT_address(String memberId, String memberAddress);
JSONResult Rockwell_keyServicegetV_member_address(String memberId); JSONResult Rockwell_keyServicegetV_member_address(String memberId);
......
增值产品-小程序及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;
...@@ -720,7 +720,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -720,7 +720,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
2. add tbl_member_user 2. add tbl_member_user
*/ */
//@Transactional //@Transactional
public int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) throws UnsupportedEncodingException public JSONResult Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan, String defaultMember, String addressStatus) throws UnsupportedEncodingException
{ {
LOGGER.debug("find Rockwell_keyServiceAddT_member"); LOGGER.debug("find Rockwell_keyServiceAddT_member");
System.out.println("find Rockwell_keyServiceAddT_member"); System.out.println("find Rockwell_keyServiceAddT_member");
...@@ -746,7 +746,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -746,7 +746,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyV_member_user.setMemberId(memberId); rockwell_keyV_member_user.setMemberId(memberId);
rockwell_keyV_member_user.setUserId(userId); rockwell_keyV_member_user.setUserId(userId);
rockwell_keyV_member_user.setStatus("01"); rockwell_keyV_member_user.setStatus("01");
rockwell_keyV_member_user.setDefaultMember("01"); rockwell_keyV_member_user.setDefaultMember(defaultMember);
rockwell_keyV_member_user.setDefaultUser("01"); rockwell_keyV_member_user.setDefaultUser("01");
rockwell_keyV_member_user.setCreateDatetime(new Date()); rockwell_keyV_member_user.setCreateDatetime(new Date());
rockwell_keyV_member_user.setUpdateDatetime(new Date()); rockwell_keyV_member_user.setUpdateDatetime(new Date());
...@@ -758,16 +758,36 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -758,16 +758,36 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyT_address.setAddressId(addressId); rockwell_keyT_address.setAddressId(addressId);
rockwell_keyT_address.setClientId(memberId); rockwell_keyT_address.setClientId(memberId);
rockwell_keyT_address.setAddressName(URLDecoder.decode(memberAddress, "UTF-8")); rockwell_keyT_address.setAddressName(URLDecoder.decode(memberAddress, "UTF-8"));
rockwell_keyT_address.setAddressStatus("01"); rockwell_keyT_address.setAddressStatus(addressStatus);
rockwell_keyT_address.setCreateDatetime(new Date()); rockwell_keyT_address.setCreateDatetime(new Date());
rockwell_keyT_address.setUpdateDatetime(new Date()); rockwell_keyT_address.setUpdateDatetime(new Date());
System.out.println(rockwell_keyV_member_user); System.out.println(rockwell_keyT_address);
rockwell_keyMapper.addT_address(rockwell_keyT_address); rockwell_keyMapper.addT_address(rockwell_keyT_address);
return 0; //设置返回值
rockwell_keyV_member_user.setMemberId(memberId);
rockwell_keyV_member_user.setAddressId(addressId);
rockwell_keyV_member_user.setAddressName(URLDecoder.decode(memberAddress, "UTF-8"));
rockwell_keyV_member_user.setAddressStatus(addressStatus);
rockwell_keyV_member_user.setMemberName(URLDecoder.decode(memberName, "UTF-8"));
rockwell_keyV_member_user.setMemberAddress(URLDecoder.decode(memberAddress, "UTF-8"));
rockwell_keyV_member_user.setMemberSlogan(URLDecoder.decode(memberSlogan, "UTF-8"));
rockwell_keyV_member_user.setMemberLogo(memberLogo);
rockwell_keyV_member_user.setMemberStatus("01");
rockwell_keyV_member_user.setDefaultMember(defaultMember);
rockwell_keyV_member_user.setDefaultUser("01");
rockwell_keyV_member_user.setCreateDatetime(new Date());
rockwell_keyV_member_user.setUpdateDatetime(new Date());
LOGGER.debug("find rockwell_keyV_member_user", rockwell_keyV_member_user);
System.out.println("find rockwell_keyV_member_user" + rockwell_keyV_member_user);
JSONResult jsonResult = new JSONResult(1, rockwell_keyV_member_user);
return jsonResult;
} }
public JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, int pageNum, int pageCount) public JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, String addressStatus, int pageNum, int pageCount)
{ {
LOGGER.debug("find Rockwell_keyServiceGetV_member_user"); LOGGER.debug("find Rockwell_keyServiceGetV_member_user");
...@@ -784,6 +804,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -784,6 +804,7 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
rockwell_keyV_member_userQuery.setUserId(userId); rockwell_keyV_member_userQuery.setUserId(userId);
rockwell_keyV_member_userQuery.setMemberId(memberId); rockwell_keyV_member_userQuery.setMemberId(memberId);
rockwell_keyV_member_userQuery.setAddressStatus(addressStatus);
rockwell_keyV_member_userQuery.setPagination(new Pagination(pageNum, pageCount)); rockwell_keyV_member_userQuery.setPagination(new Pagination(pageNum, pageCount));
listRockwell_keyV_member_user = rockwell_keyMapper.getV_member_user_by_page(rockwell_keyV_member_userQuery); listRockwell_keyV_member_user = rockwell_keyMapper.getV_member_user_by_page(rockwell_keyV_member_userQuery);
......
增值产品-小程序及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;
...@@ -570,6 +570,7 @@ public class NyxApiController { ...@@ -570,6 +570,7 @@ public class NyxApiController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "按用户id查找", required = false, dataType = "String"), @ApiImplicitParam(name = "userId", value = "按用户id查找", required = false, dataType = "String"),
@ApiImplicitParam(name = "memberId", value = "按商家id查找", required = false, dataType = "String"), @ApiImplicitParam(name = "memberId", value = "按商家id查找", required = false, dataType = "String"),
@ApiImplicitParam(name = "addressStatus", value = "是否是该商家默认地址", required = false, dataType = "String"),
@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")
}) })
...@@ -577,10 +578,11 @@ public class NyxApiController { ...@@ -577,10 +578,11 @@ public class NyxApiController {
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,
@RequestParam(value = "addressStatus", required = false, defaultValue = "01") String addressStatus,
@RequestParam(value = "pageNum", required = false, defaultValue = "1") int pageNum, @RequestParam(value = "pageNum", required = false, defaultValue = "1") int pageNum,
@RequestParam(value = "pageCount", required = false, defaultValue = "4") int pageCount @RequestParam(value = "pageCount", required = false, defaultValue = "4") int pageCount
) { ) {
return keyService.Rockwell_keyServiceGetV_member_user(userId, memberId, pageNum, pageCount); return keyService.Rockwell_keyServiceGetV_member_user(userId, memberId, addressStatus, pageNum, pageCount);
} }
// 7.2 更新member的信息 editMember // 7.2 更新member的信息 editMember
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
package cn.com.fun.nyxkey.api.web.controller; package cn.com.fun.nyxkey.api.web.controller;
...@@ -126,7 +126,7 @@ public class OssApiController { ...@@ -126,7 +126,7 @@ public class OssApiController {
*/ */
@RequestMapping(value = "/nyx/oss/member/callback", method = RequestMethod.POST) @RequestMapping(value = "/nyx/oss/member/callback", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public JSONObject addmember ( public JSONResult addmember (
@RequestParam(value = "filename", required = false, defaultValue = "0") String filename, @RequestParam(value = "filename", required = false, defaultValue = "0") String filename,
@RequestParam(value = "size", required = false, defaultValue = "0") String size, @RequestParam(value = "size", required = false, defaultValue = "0") String size,
@RequestParam(value = "height", required = false, defaultValue = "0") String height, @RequestParam(value = "height", required = false, defaultValue = "0") String height,
...@@ -136,15 +136,14 @@ public class OssApiController { ...@@ -136,15 +136,14 @@ public class OssApiController {
@RequestParam(value = "memberSlogan", required = false, defaultValue = "0") String memberSlogan, @RequestParam(value = "memberSlogan", required = false, defaultValue = "0") String memberSlogan,
@RequestParam(value = "image", required = false, defaultValue = "0") String image, @RequestParam(value = "image", required = false, defaultValue = "0") String image,
@RequestParam(value = "addressId", required = false, defaultValue = "0") String addressId, @RequestParam(value = "addressId", required = false, defaultValue = "0") String addressId,
@RequestParam(value = "defaultMember", required = false, defaultValue = "01") String defaultMember,
@RequestParam(value = "addressStatus", required = false, defaultValue = "01") String addressStatus,
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId, @RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@RequestParam(value = "userId", required = false, defaultValue = "0") String userId @RequestParam(value = "userId", required = false, defaultValue = "0") String userId
) throws UnsupportedEncodingException { ) throws UnsupportedEncodingException {
System.out.println("===member/callback_\n"); System.out.println("===member/callback_\n");
System.out.println("=== filename="+filename+"&name="+memberName+"&address="+memberAddress+"&slogan="+memberSlogan+"&image="+image+"&memberId="+memberId+"&userId="+userId+"&addressId="+addressId); System.out.println("=== filename="+filename+"&name="+memberName+"&address="+memberAddress+"&slogan="+memberSlogan+"&image="+image+"&memberId="+memberId+"&userId="+userId+"&addressId="+addressId+"&defaultMember="+defaultMember+"&addressStatus="+addressStatus);
keyService.Rockwell_keyServiceAddT_member(userId, memberId, addressId, image, memberName, memberAddress, memberSlogan); return keyService.Rockwell_keyServiceAddT_member(userId, memberId, addressId, image, memberName, memberAddress, memberSlogan, defaultMember, addressStatus);
JSONObject result = new JSONObject();
result.put("Status","OK");
return result;
} }
} }
......
增值产品-小程序及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"?>
...@@ -606,12 +606,17 @@ limitations under the License. ...@@ -606,12 +606,17 @@ limitations under the License.
( (
SELECT openid FROM view_member_user SELECT openid FROM view_member_user
WHERE 1=1 WHERE 1=1
AND default_member="01"
AND user_id=#{userId} AND user_id=#{userId}
limit 1
) )
</if> </if>
<if test="memberId != null and memberId != '' "> <if test="memberId != null and memberId != '' ">
AND member_id=#{memberId} AND member_id=#{memberId}
</if> </if>
<if test="addressStatus != null and addressStatus != '' ">
AND address_status=#{addressStatus}
</if>
order by default_member desc, create_datetime desc order by default_member desc, create_datetime desc
<if test="pagination != null "> <if test="pagination != null ">
<include refid="pagination"/> <include refid="pagination"/>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论