Skip to content

N
nyx
Commit f665192e by jscat
Options

nyx javaapp: 功能新增 

1. 新增'修改商家信息'功能
2. 新增'新增商家地址'功能
parent 11ad298b
正在显示 包含 352 行增加 和 8 行删除
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/common/ExceptionMsg.java
package cn.com.fun.nyxkey.api.common;
package cn.com.fun.nyxkey.api.common;
......@@ -26,7 +26,11 @@ public enum ExceptionMsg {
OSSTokenNameIsBlack("000501", "cardNumber或tokenName不能为空！"),
OSSServerInternalError("000502", "获取阿里oss token失败，服务器内部错误！"),
ResubmitError("000601", "重复提交错误!")
ResubmitError("000601", "重复提交错误!"),
EditMemberError("000701", "更新商家信息错误!"),
AddAddressError("000701", "新增地址信息错误!")
;
private ExceptionMsg(String code, String msg) {
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyV_member_address.java 0 → 100644
package cn.com.fun.nyxkey.api.domain;
package cn.com.fun.nyxkey.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* 发布表
* Created by jscat on 2020/09/24.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Rockwell_keyV_member_address{
private String memberId; // 商家的id, uuid format
private String addressId; // 用户的id, uuid format
private String addressStatus; // 默认地址: 00: 否;01:是
private String memberStatus; // 用户状态: 00: 未注册用户; 01: 已注册用户
private String memberName; // 名字
private String memberAddress; // 地址
private String memberSlogan; // slogan
private String memberLogo; // logo url
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createDatetime; // 统计周期
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateDatetime; // 更新日期
}
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/query/Rockwell_keyT_memberQuery.java 0 → 100644
package cn.com.fun.nyxkey.api.domain.query;
package cn.com.fun.nyxkey.api.domain.query;
import cn.com.fun.nyxkey.api.common.Pagination;
import cn.com.fun.nyxkey.api.domain.Rockwell_keyT_match;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* Created by jscat on 2020/09/24
*/
@Data
@AllArgsConstructor
public class Rockwell_keyT_memberQuery {
private String memberId;
private String addressId;
private String memberSlogan;
private String memberAddress;
private Pagination pagination;
//默认返回1页4条记录
public Rockwell_keyT_memberQuery()
{
this.pagination = new Pagination(1, 4);
}
public void setMemberId(String strMemberId)
{
if(strMemberId.equals("0"))
{
this.memberId = null;
}
else
{
this.memberId = strMemberId;
}
}
public void setAddressId(String strAddressId)
{
if(strAddressId.equals("0"))
{
this.addressId = null;
}
else
{
this.addressId = strAddressId;
}
}
public void setMemberSlogan(String strMemberSlogan)
{
if(strMemberSlogan.equals("0"))
{
this.memberSlogan = null;
}
else
{
this.memberSlogan = strMemberSlogan;
}
}
public void setMemberAddress(String strMemberAddress)
{
if(strMemberAddress.equals("0"))
{
this.memberAddress = null;
}
else
{
this.memberAddress = strMemberAddress;
}
}
@Override
public String toString() {
return "Rockwell_keyT_memberQuery{" +
"memberId='" + memberId + '\'' +
"addressId='" + addressId + '\'' +
"memberSlogan='" + memberSlogan + '\'' +
"memberAddress='" + memberAddress + '\'' +
"pagination='" + pagination + '\'' +
'}';
}
}
增值产品-小程序及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;
......@@ -63,8 +63,12 @@ public interface Rockwell_keyMapper {
/* member api */
void addT_member(Rockwell_keyT_member rockwell_keyT_member);
void updateT_member_user(Rockwell_keyV_member_user rockwell_keyV_member_user);
void addT_address(Rockwell_keyT_address rockwell_keyT_address);
int addT_address(Rockwell_keyT_address rockwell_keyT_address);
int updateT_member(Rockwell_keyT_memberQuery rockwell_keyT_memberQuery);
int updateT_address(Rockwell_keyT_memberQuery rockwell_keyT_memberQuery);
List<Rockwell_keyT_member> getT_member(Rockwell_keyT_memberQuery rockwell_keyT_memberQuery);
List<Rockwell_keyV_member_user> getV_member_user_by_page(Rockwell_keyV_member_userQuery rockwell_keyV_member_userQuery);
List<Rockwell_keyV_member_address> getV_member_address(Rockwell_keyT_memberQuery rockwell_keyT_memberQuery);
/* testing */
void test(Rockwell_keyT_matchQuery rockwell_keyT_matchQuery);
......
增值产品-小程序及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;
......@@ -86,6 +86,9 @@ public interface Rockwell_keyService {
*/
int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) throws UnsupportedEncodingException;
JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, int pageNum, int pageCount);
JSONResult Rockwell_keyServiceUpdateT_member(String memberId, String addressId, String memberSlogan, String memberAddress, String addressStatus);
JSONResult Rockwell_keyServiceAddT_address(String memberId, String memberAddress);
JSONResult Rockwell_keyServicegetV_member_address(String memberId);
// testing
void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match);
......
增值产品-小程序及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;
......@@ -793,6 +793,119 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
}
public JSONResult Rockwell_keyServiceUpdateT_member(String memberId, String addressId, String memberSlogan, String memberAddress, String addressStatus)
{
LOGGER.debug("find Rockwell_keyServiceUpdate_member");
List<Rockwell_keyT_member> listRockwell_keyT_member = new ArrayList<>();
Rockwell_keyT_memberQuery rockwell_keyT_memberQuery = new Rockwell_keyT_memberQuery();
//判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
//memberId和addressId必须存在
if((StringUtils.isEmpty(memberId) || memberId.equals("0")) && (StringUtils.isEmpty(addressId) || addressId.equals("0")))
{
return new JSONResult(ExceptionMsg.ParamError);
}
rockwell_keyT_memberQuery.setMemberId(memberId);
rockwell_keyT_memberQuery.setAddressId(addressId);
rockwell_keyT_memberQuery.setMemberAddress(memberAddress);
rockwell_keyT_memberQuery.setMemberSlogan(memberSlogan);
int ret = 0;
//如果是默认地址信息，则同步更新tbl_member和tbl_address
if(addressStatus.equals("01") )
{
ret = rockwell_keyMapper.updateT_member(rockwell_keyT_memberQuery);
ret = rockwell_keyMapper.updateT_address(rockwell_keyT_memberQuery) * ret;
}
else
{
ret = rockwell_keyMapper.updateT_address(rockwell_keyT_memberQuery);
}
if(ret == 1) // 成功
{
JSONResult jsonResult = new JSONResult(0, listRockwell_keyT_member);
return jsonResult;
}
else
{
return new JSONResult(ExceptionMsg.EditMemberError);
}
}
public JSONResult Rockwell_keyServiceAddT_address(String memberId, String memberAddress)
{
LOGGER.debug("find Rockwell_keyServiceAdd_member_address");
Rockwell_keyT_address rockwell_keyT_address = new Rockwell_keyT_address();
List<Rockwell_keyT_member> listRockwell_keyT_member = new ArrayList<>();
Rockwell_keyT_memberQuery rockwell_keyT_memberQuery = new Rockwell_keyT_memberQuery();
//判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
//memberId必须存在
if((StringUtils.isEmpty(memberId) || memberId.equals("0")))
{
return new JSONResult(ExceptionMsg.ParamError);
}
//step1: jscat 20200924 在insert之前需要对memberId进行一下核实
rockwell_keyT_memberQuery.setMemberId(memberId);
listRockwell_keyT_member = rockwell_keyMapper.getT_member(rockwell_keyT_memberQuery);
if(listRockwell_keyT_member.size() == 0)
{
return new JSONResult(ExceptionMsg.AddAddressError);
}
//step2: 写入数据
rockwell_keyT_address.setAddressId("addid_"+UUID.randomUUID().toString());
rockwell_keyT_address.setClientId(memberId);
rockwell_keyT_address.setAddressName(memberAddress);
rockwell_keyT_address.setAddressStatus("00");
rockwell_keyT_address.setCreateDatetime(new Date());
rockwell_keyT_address.setUpdateDatetime(new Date());
int ret = rockwell_keyMapper.addT_address(rockwell_keyT_address);
if(ret == 1) // 成功
{
JSONResult jsonResult = new JSONResult(0, rockwell_keyT_address);
return jsonResult;
}
else
{
return new JSONResult(ExceptionMsg.AddAddressError);
}
}
public JSONResult Rockwell_keyServicegetV_member_address(String memberId)
{
LOGGER.debug("find Rockwell_keyServicegetV_member_address");
List<Rockwell_keyV_member_address> listRockwell_keyV_member_address = new ArrayList<>();
Rockwell_keyT_memberQuery rockwell_keyT_memberQuery = new Rockwell_keyT_memberQuery();
//step1: 判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
//memberId必须存在
if((StringUtils.isEmpty(memberId) || memberId.equals("0")))
{
return new JSONResult(ExceptionMsg.ParamError);
}
//step2: 查询数据
rockwell_keyT_memberQuery.setMemberId(memberId);
listRockwell_keyV_member_address = rockwell_keyMapper.getV_member_address(rockwell_keyT_memberQuery);
int totalCount = listRockwell_keyV_member_address.size();
JSONResult jsonResult = new JSONResult(totalCount, listRockwell_keyV_member_address);
return jsonResult;
}
// testing
public void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match)
......
增值产品-小程序及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;
......@@ -583,6 +583,60 @@ public class NyxApiController {
return keyService.Rockwell_keyServiceGetV_member_user(userId, memberId, pageNum, pageCount);
}
// 7.2 更新member的信息 editMember
// 1. 按照 member_id
// param: memberSlogan
// param: memberAddress
// 返回 resCode
@ApiOperation(value="更新商家信息editMember", notes="更新商家信息editMember")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberId", value = "按商家id查找", required = true, dataType = "String"),
@ApiImplicitParam(name = "memberSlogan", value = "更新slogan", required = false, dataType = "String"),
@ApiImplicitParam(name = "memberAddress", value = "更新address", required = false, dataType = "String"),
@ApiImplicitParam(name = "addressStatus", value = "address是否默认", required = false, dataType = "String"),
})
@RequestMapping(value = "/nyx/member/update", method = RequestMethod.GET)
public JSONResult RockwellUpdateMember(
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@RequestParam(value = "addressId", required = false, defaultValue = "0") String addressId,
@RequestParam(value = "memberSlogan", required = false, defaultValue = "0") String memberSlogan,
@RequestParam(value = "memberAddress", required = false, defaultValue = "0") String memberAddress,
@RequestParam(value = "addressStatus", required = false, defaultValue = "0") String addressStatus
) {
return keyService.Rockwell_keyServiceUpdateT_member(memberId, addressId, memberSlogan, memberAddress, addressStatus);
}
// 7.3 增加member的地址信息 addAddress
// 1. 按照 member_id
// param: memberAddress
// 返回 resCode
@ApiOperation(value="新增商家的地址信息addAddress", notes="新增商家的地址信息addAddress")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberId", value = "按商家id查找", required = true, dataType = "String"),
@ApiImplicitParam(name = "memberAddress", value = "更新address", required = false, dataType = "String")
})
@RequestMapping(value = "/nyx/member/add/address", method = RequestMethod.GET)
public JSONResult RockwellAddAddress(
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@RequestParam(value = "memberAddress", required = false, defaultValue = "0") String memberAddress
) {
return keyService.Rockwell_keyServiceAddT_address(memberId, memberAddress);
}
// 7.4 查询member的所有address信息
// 1. 按照 member_id
// 返回
@ApiOperation(value="查询member的所有address信息", notes="查询member的所有address信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberId", value = "按商家id查找", required = true, dataType = "String")
})
@RequestMapping(value = "/nyx/member/address/query", method = RequestMethod.GET)
public JSONResult RockwellMemberAddressQuery(
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId
) {
return keyService.Rockwell_keyServicegetV_member_address(memberId);
}
// 2.0 test
@ApiOperation(value="test", notes="test")
@ApiImplicitParams({
......
增值产品-小程序及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"?>
......@@ -552,6 +552,49 @@ limitations under the License.
values (#{addressId}, #{addressStatus}, #{addressName} , #{clientId}, #{createDatetime}, #{updateDatetime})
</insert>
<!-- 更新一条member信息 -->
<update id="updateT_member" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_memberQuery">
update tbl_member
<set>
<if test="memberSlogan != null and memberSlogan != '' ">
member_slogan=#{memberSlogan},
</if>
<if test="memberAddress != null and memberAddress != '' ">
member_address=#{memberAddress},
</if>
</set>
where id=#{memberId};
</update>
<update id="updateT_address" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_memberQuery">
update tbl_address
<set>
<if test="memberAddress != null and memberAddress != '' ">
address_name=#{memberAddress},
</if>
</set>
where 1=1
AND client_id=#{memberId}
AND address_id=#{addressId}
</update>
<select id="getT_member" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_memberQuery"
resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyT_member">
select * from tbl_member
where 1=1
AND member_status="01"
AND id=#{memberId}
</select>
<select id="getV_member_address" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_memberQuery"
resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_member_address">
select * from view_member_address
where 1=1
AND member_status="01"
AND member_id=#{memberId}
order by address_status desc, create_datetime asc
</select>
<select id="getV_member_user_by_page" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyV_member_userQuery"
resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_member_user">
select * from view_member_user
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论