Skip to content

N
nyx
Commit 0fb97852 by jscat
Options

nyx javaapp: 功能更新 

1. 添加regMember功能, 上传member_logo到oss
2. 完善上传活动图片到阿里云功能
3. 添加活动(tbl_activity)+活动类别(tbl_product)
4. 添加读取view_member_user的功能
parent 8be222a8
正在显示 包含 512 行增加 和 17 行删除
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyT_activity.java
package cn.com.fun.nyxkey.api.domain; package cn.com.fun.nyxkey.api.domain;
...@@ -8,7 +8,7 @@ import java.util.Date; ...@@ -8,7 +8,7 @@ import java.util.Date;
/** /**
* 活动信息发布表 * 活动信息发布表
* Created by jscat on 2020/08/04. * Created by jscat on 2020/09/02.
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
...@@ -16,11 +16,14 @@ import java.util.Date; ...@@ -16,11 +16,14 @@ import java.util.Date;
public class Rockwell_keyT_activity{ public class Rockwell_keyT_activity{
private String activityId; // 活动的id, uuid format private String activityId; // 活动的id, uuid format
private String memberId; // 商家的id, uuid format private String activityStatus; // 活动状态: 00: 不可参与;01:可参与
private String tag; // 活动的标签 private String tag; // 活动的标签
private String title; // 活动的标题 private String title; // 活动的标题
private int numLike; // 针对每条activity的点赞次数，每点一次，则累加 private int numLike; // 针对每条activity的点赞次数，每点一次，则累加
private String content; // 活动内容 private String content; // 活动内容
private String userId; // 用户的id, uuid format
private String memberId; // 商家的id, uuid format
private String addressId; // 地址的id, uuid format
private String noteImage; // 该条活动的image列表 private String noteImage; // 该条活动的image列表
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createDatetime; // 统计周期 private Date createDatetime; // 统计周期
......
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyT_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/02.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Rockwell_keyT_address{
private String addressId; // 商家的id, uuid format
private String addressStatus; // 状态
private String addressName; // 名字
private String clientId; // 商家或用户id
@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/Rockwell_keyT_member.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/01.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Rockwell_keyT_member{
private String id; // 商家的id, uuid format
private String memberStatus; // 状态
private String memberName; // 名字
private String memberSlogan; // slogan
private String memberAddress; // 地址
private String memberLogo; // logo url
private Double lon;
private Double lat;
private String geoCode; // geohash编码
@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/Rockwell_keyT_product.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/02.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Rockwell_keyT_product{
private String productId; // product的id, uuid format
private String activityId; // 活动的id, uuid format
private String productStatus; // 商品状态: 00:非可售 01:可售
private String defaultStatus; // 默认状态: 00:普通 01:默认状态; 默认是第一个product
private String productDesc; // 类别说明
private Double unitPrice; // 价格
private int stock; // 库存数量
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startDatetime; // 开始时间
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endDatetime; // 结束时间
@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/Rockwell_keyV_member_user.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/02.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Rockwell_keyV_member_user{
private String memberId; // 商家的id, uuid format
private String userId; // 用户的id, uuid format
private String addressId; // 用户的id, uuid format
private String status; // 关系是否存在, 00: 不存在; 01: 存在
private String defaultMember; // 用户的默认商家: 00: 非默认; 01: 默认
private String defaultUser; // 商家的默认用户: 00: 非默认; 01: 默认
private String memberStatus; // 用户状态: 00: 未注册用户; 01: 已注册用户
private String memberName; // 名字
private String memberAddress; // 地址
private String AddressName; // 地址
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_productQuery.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 cn.com.fun.nyxkey.api.domain.Rockwell_keyT_product;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* Created by jscat on 2020/09/02
*/
@Data
@AllArgsConstructor
public class Rockwell_keyT_productQuery {
private List<Rockwell_keyT_product> listRockwell_keyT_product;
//默认返回1页4条记录
public Rockwell_keyT_productQuery()
{
}
@Override
public String toString() {
return "Rockwell_keyT_productQuery{" +
"listRockwell_keyT_product='" + listRockwell_keyT_product + '\'' +
'}';
}
}
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/query/Rockwell_keyV_member_userQuery.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/02
*/
@Data
@AllArgsConstructor
public class Rockwell_keyV_member_userQuery {
private String userId;
private String memberId;
private Pagination pagination;
//默认返回1页4条记录
public Rockwell_keyV_member_userQuery()
{
this.pagination = new Pagination(1, 4);
}
public void setMemberId(String strMemberId)
{
if(strMemberId.equals("0"))
{
this.memberId = null;
}
else
{
this.memberId = strMemberId;
}
}
public void setUserId(String strUserId)
{
if(strUserId.equals("0"))
{
this.userId = null;
}
else
{
this.userId = strUserId;
}
}
@Override
public String toString() {
return "Rockwell_keyV_member_userQuery{" +
"memberId='" + memberId + '\'' +
"userId='" + userId + '\'' +
"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;
...@@ -39,6 +39,8 @@ public interface Rockwell_keyMapper { ...@@ -39,6 +39,8 @@ public interface Rockwell_keyMapper {
List<Rockwell_keyV_activity_info> getV_activity_detail_by_id(Rockwell_keyT_activityQuery rockwell_keyT_activityQuery); List<Rockwell_keyV_activity_info> getV_activity_detail_by_id(Rockwell_keyT_activityQuery rockwell_keyT_activityQuery);
void addT_activityLike(Rockwell_keyT_activity rockwell_keyT_activity); void addT_activityLike(Rockwell_keyT_activity rockwell_keyT_activity);
void delT_activityLike(Rockwell_keyT_activity rockwell_keyT_activity); void delT_activityLike(Rockwell_keyT_activity rockwell_keyT_activity);
void addT_activity(Rockwell_keyT_activity rockwell_keyT_activity);
void addT_product(Rockwell_keyT_productQuery rockwell_keyT_productQuery);
/* post api */ /* post api */
List<Rockwell_keyV_post_info> getV_post_info(Rockwell_keyT_postQuery rockwell_keyT_postQuery); List<Rockwell_keyV_post_info> getV_post_info(Rockwell_keyT_postQuery rockwell_keyT_postQuery);
...@@ -53,8 +55,11 @@ public interface Rockwell_keyMapper { ...@@ -53,8 +55,11 @@ public interface Rockwell_keyMapper {
List<Rockwell_keyV_collect> getV_collect_by_page(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery); List<Rockwell_keyV_collect> getV_collect_by_page(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery);
void updateT_collect(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery); void updateT_collect(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery);
/* */ /* member api */
void addT_member(Rockwell_keyT_member rockwell_keyT_member); 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);
List<Rockwell_keyV_member_user> getV_member_user_by_page(Rockwell_keyV_member_userQuery rockwell_keyV_member_userQuery);
/* testing */ /* testing */
void test(Rockwell_keyT_matchQuery rockwell_keyT_matchQuery); 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;
...@@ -51,6 +51,8 @@ public interface Rockwell_keyService { ...@@ -51,6 +51,8 @@ public interface Rockwell_keyService {
JSONResult Rockwell_keyServiceGetV_activity_detail_by_id(String activityId); JSONResult Rockwell_keyServiceGetV_activity_detail_by_id(String activityId);
int Rockwell_keyServiceAddT_activityLike(String activityId); int Rockwell_keyServiceAddT_activityLike(String activityId);
int Rockwell_keyServiceDelT_activityLike(String activityId); int Rockwell_keyServiceDelT_activityLike(String activityId);
int Rockwell_keyServiceAddT_activity(String userId, String memberId, String addressId, String noteImage, String tag, String title, String content,
List<String> desc, List<Double> price, List<Integer> stock) throws UnsupportedEncodingException;
/* post api */ /* post api */
JSONResult Rockwell_keyServiceGetV_post_info(String tag, String title, String top, int pageNum, int pageCount); JSONResult Rockwell_keyServiceGetV_post_info(String tag, String title, String top, int pageNum, int pageCount);
...@@ -74,9 +76,10 @@ public interface Rockwell_keyService { ...@@ -74,9 +76,10 @@ public interface Rockwell_keyService {
int Rockwell_keyServiceUpdateT_collect(String userId, String activityId, String collectStatus); int Rockwell_keyServiceUpdateT_collect(String userId, String activityId, String collectStatus);
/* /*
add member api member api
*/ */
int Rockwell_keyServiceAddT_member(String memberId, String memberLogo, String memberName, String memberAddress) throws UnsupportedEncodingException; 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);
// testing // testing
void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match); 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;
...@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Qualifier; ...@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource; import javax.sql.DataSource;
...@@ -415,6 +416,66 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -415,6 +416,66 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
return 0; return 0;
} }
public int Rockwell_keyServiceAddT_activity(String userId, String memberId, String addressId, String noteImage, String tag, String title, String content,
List<String> desc, List<Double> price, List<Integer> stock) throws UnsupportedEncodingException
{
LOGGER.debug("find Rockwell_keyServiceAddT_activity");
System.out.println("find Rockwell_keyServiceAddT_activity");
Rockwell_keyT_activity rockwell_keyT_activity = new Rockwell_keyT_activity();
String activityId = "aid_"+UUID.randomUUID().toString();
rockwell_keyT_activity.setActivityId(activityId);
rockwell_keyT_activity.setUserId(userId);
rockwell_keyT_activity.setMemberId(memberId);
rockwell_keyT_activity.setAddressId(addressId);
rockwell_keyT_activity.setActivityStatus("01");
rockwell_keyT_activity.setNumLike(0);
rockwell_keyT_activity.setTag(URLDecoder.decode(tag, "UTF-8"));
rockwell_keyT_activity.setNoteImage(noteImage);
rockwell_keyT_activity.setTitle(URLDecoder.decode(title, "UTF-8"));
rockwell_keyT_activity.setContent(URLDecoder.decode(content, "UTF-8"));
rockwell_keyT_activity.setCreateDatetime(new Date());
rockwell_keyT_activity.setUpdateDatetime(new Date());
System.out.println(rockwell_keyT_activity);
rockwell_keyMapper.addT_activity(rockwell_keyT_activity);
//同步更新tbl_product
Rockwell_keyT_productQuery rockwell_keyT_productQuery = new Rockwell_keyT_productQuery();
List<Rockwell_keyT_product> listRockwell_keyT_product = new ArrayList<>();
if(desc.size() > 0)
{
for(int i=0; i<desc.size(); i++)
{
Rockwell_keyT_product rockwell_keyT_product = new Rockwell_keyT_product();
rockwell_keyT_product.setProductId("pid_"+UUID.randomUUID().toString());
rockwell_keyT_product.setActivityId(activityId);
rockwell_keyT_product.setProductStatus("01");
rockwell_keyT_product.setProductDesc(URLDecoder.decode(desc.get(i), "UTF-8"));
rockwell_keyT_product.setUnitPrice(price.get(i));
rockwell_keyT_product.setStock(stock.get(i));
if(i == 0)
{
rockwell_keyT_product.setDefaultStatus("01");
}
else
{
rockwell_keyT_product.setDefaultStatus("00");
}
rockwell_keyT_product.setStartDatetime(new Date());
rockwell_keyT_product.setEndDatetime(new Date());
rockwell_keyT_product.setCreateDatetime(new Date());
rockwell_keyT_product.setUpdateDatetime(new Date());
listRockwell_keyT_product.add(rockwell_keyT_product);
}
rockwell_keyT_productQuery.setListRockwell_keyT_product(listRockwell_keyT_product);
rockwell_keyMapper.addT_product(rockwell_keyT_productQuery);
}
return 0;
}
/* post api */ /* post api */
// getV_post_info // getV_post_info
public JSONResult Rockwell_keyServiceGetV_post_info(String tag, String title, String top, int pageNum, int pageCount) public JSONResult Rockwell_keyServiceGetV_post_info(String tag, String title, String top, int pageNum, int pageCount)
...@@ -568,27 +629,83 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService { ...@@ -568,27 +629,83 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
/* /*
add member api add member api
1. add tbl_member
2. add tbl_member_user
*/ */
public int Rockwell_keyServiceAddT_member(String memberId, String memberLogo, String memberName, String memberAddress) throws UnsupportedEncodingException // @Transactional
public int Rockwell_keyServiceAddT_member(String userId, String memberId, String addressId, String memberLogo, String memberName, String memberAddress, String memberSlogan) 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");
//step1: 更新tbl_member
Rockwell_keyT_member rockwell_keyT_member = new Rockwell_keyT_member(); Rockwell_keyT_member rockwell_keyT_member = new Rockwell_keyT_member();
rockwell_keyT_member.setId(memberId); rockwell_keyT_member.setId(memberId);
rockwell_keyT_member.setMemberStatus("01"); rockwell_keyT_member.setMemberStatus("01");
rockwell_keyT_member.setMemberLogo(memberLogo); rockwell_keyT_member.setMemberLogo(memberLogo);
rockwell_keyT_member.setMemberName(URLDecoder.decode(memberName, "UTF-8")); rockwell_keyT_member.setMemberName(URLDecoder.decode(memberName, "UTF-8"));
rockwell_keyT_member.setMemberAddress(URLDecoder.decode(memberAddress, "UTF-8")); rockwell_keyT_member.setMemberAddress(URLDecoder.decode(memberAddress, "UTF-8"));
rockwell_keyT_member.setGeoCode(""); rockwell_keyT_member.setMemberSlogan(URLDecoder.decode(memberSlogan, "UTF-8"));
rockwell_keyT_member.setGeoCode(null);
rockwell_keyT_member.setLat(null); rockwell_keyT_member.setLat(null);
rockwell_keyT_member.setLon(null); rockwell_keyT_member.setLon(null);
rockwell_keyT_member.setCreateDatetime(new Date()); rockwell_keyT_member.setCreateDatetime(new Date());
rockwell_keyT_member.setUpdateDatetime(new Date()); rockwell_keyT_member.setUpdateDatetime(new Date());
System.out.println(rockwell_keyT_member); System.out.println(rockwell_keyT_member);
rockwell_keyMapper.addT_member(rockwell_keyT_member); rockwell_keyMapper.addT_member(rockwell_keyT_member);
//step2: 同步更新tbl_member_user
Rockwell_keyV_member_user rockwell_keyV_member_user = new Rockwell_keyV_member_user();
rockwell_keyV_member_user.setMemberId(memberId);
rockwell_keyV_member_user.setUserId(userId);
rockwell_keyV_member_user.setStatus("01");
rockwell_keyV_member_user.setDefaultMember("01");
rockwell_keyV_member_user.setDefaultUser("01");
rockwell_keyV_member_user.setCreateDatetime(new Date());
rockwell_keyV_member_user.setUpdateDatetime(new Date());
System.out.println(rockwell_keyV_member_user);
rockwell_keyMapper.updateT_member_user(rockwell_keyV_member_user);
//step3: 同步更新tbl_address
Rockwell_keyT_address rockwell_keyT_address = new Rockwell_keyT_address();
rockwell_keyT_address.setAddressId(addressId);
rockwell_keyT_address.setClientId(memberId);
rockwell_keyT_address.setAddressName(memberAddress);
rockwell_keyT_address.setAddressStatus("01");
rockwell_keyT_address.setCreateDatetime(new Date());
rockwell_keyT_address.setUpdateDatetime(new Date());
System.out.println(rockwell_keyV_member_user);
rockwell_keyMapper.addT_address(rockwell_keyT_address);
return 0; return 0;
} }
public JSONResult Rockwell_keyServiceGetV_member_user(String userId, String memberId, int pageNum, int pageCount)
{
LOGGER.debug("find Rockwell_keyServiceGetV_member_user");
List<Rockwell_keyV_member_user> listRockwell_keyV_member_user = new ArrayList<>();
Rockwell_keyV_member_userQuery rockwell_keyV_member_userQuery = new Rockwell_keyV_member_userQuery();
//判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
//默认设置 member_userStatus == "01"
//默认设置 end_datetime >= NOW()
if((StringUtils.isEmpty(userId) || userId.equals("0")) && (StringUtils.isEmpty(memberId) || memberId.equals("0")))
{
return new JSONResult(ExceptionMsg.ParamError);
}
rockwell_keyV_member_userQuery.setUserId(userId);
rockwell_keyV_member_userQuery.setMemberId(memberId);
rockwell_keyV_member_userQuery.setPagination(new Pagination(pageNum, pageCount));
listRockwell_keyV_member_user = rockwell_keyMapper.getV_member_user_by_page(rockwell_keyV_member_userQuery);
int totalCount = listRockwell_keyV_member_user.size();
JSONResult jsonResult = new JSONResult(totalCount, listRockwell_keyV_member_user);
return jsonResult;
}
// testing // testing
public void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match) 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;
...@@ -492,6 +492,29 @@ public class NyxApiController { ...@@ -492,6 +492,29 @@ public class NyxApiController {
keyService.Rockwell_keyServiceUpdateT_collect(userId, activityId, "00"); keyService.Rockwell_keyServiceUpdateT_collect(userId, activityId, "00");
} }
// 商家用户表(tbl_member_user)的相关api 获取 view_member_user 的数据 by page
// 7.1 user/member 的相关查询
// 1. 按照 user_id
// 2. 按照 member_id
// collect_status == '01' && end_datetime >= NOW()
// 返回 Rockwell_keyV_member_user
@ApiOperation(value="获取商家用户视图的信息", notes="获取商家用户视图的信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "按用户id查找", required = false, dataType = "String"),
@ApiImplicitParam(name = "memberId", value = "按商家id查找", required = false, dataType = "String"),
@ApiImplicitParam(name = "pageNum", value = "页码，从1开始", required = false, dataType = "String", defaultValue = "1"),
@ApiImplicitParam(name = "pageCount", value = "每页的数据个数，默认是4个", required = false, dataType = "String", defaultValue = "4")
})
@RequestMapping(value = "/nyx/member/query", method = RequestMethod.GET)
public JSONResult RockwellQueryMember(
@RequestParam(value = "userId", required = false, defaultValue = "0") String userId,
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@RequestParam(value = "pageNum", required = false, defaultValue = "1") int pageNum,
@RequestParam(value = "pageCount", required = false, defaultValue = "4") int pageCount
) {
return keyService.Rockwell_keyServiceGetV_member_user(userId, memberId, pageNum, pageCount);
}
// 2.0 test // 2.0 test
@ApiOperation(value="test", notes="test") @ApiOperation(value="test", notes="test")
@ApiImplicitParams({ @ApiImplicitParams({
...@@ -505,5 +528,20 @@ public class NyxApiController { ...@@ -505,5 +528,20 @@ public class NyxApiController {
keyService.Rockwell_keyServiceTest(listRockwell_keyT_match); keyService.Rockwell_keyServiceTest(listRockwell_keyT_match);
} }
// 2.0 test
// http://localhost:8085/api/nyx/match/get?desc=会员&price=199&stock=10&desc=普通&price=299&stock=20
@ApiOperation(value="test", notes="test")
@ApiImplicitParams({
})
@RequestMapping(value = "/nyx/match/get", method = RequestMethod.GET)
// @ResponseBody
public void RockwellQueryGet(
@RequestParam(value = "desc", required = false, defaultValue = "0") List<String> desc,
@RequestParam(value = "price", required = false, defaultValue = "0") List<String> price,
@RequestParam(value = "stock", required = false, defaultValue = "0") List<String> stock
) {
}
} }
增值产品-小程序及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;
...@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.List;
/** /**
* Created by jscat on 2020-04-21. * Created by jscat on 2020-04-21.
...@@ -82,6 +83,40 @@ public class OssApiController { ...@@ -82,6 +83,40 @@ public class OssApiController {
} }
// refer:
// https://blog.csdn.net/feiyst/article/details/88431621
// SpringBoot 出现 Content type 'application/x-www-form-urlencoded;charset=UTF-8' not supported
// 前端请求传Json对象则后端使用@RequestParam
// 前端请求传Json对象的字符串则后端使用@RequestBody。
@RequestMapping(value = "/nyx/oss/activity/callback", method = RequestMethod.POST)
@ResponseBody
public JSONObject addActivity (
@RequestParam(value = "filename", required = false, defaultValue = "0") String filename,
@RequestParam(value = "size", required = false, defaultValue = "0") String size,
@RequestParam(value = "height", required = false, defaultValue = "0") String height,
@RequestParam(value = "width", required = false, defaultValue = "0") String width,
@RequestParam(value = "tag", required = false, defaultValue = "0") String tag,
@RequestParam(value = "title", required = false, defaultValue = "0") String title,
@RequestParam(value = "content", required = false, defaultValue = "0") String content,
@RequestParam(value = "image", required = false, defaultValue = "0") String image,
@RequestParam(value = "addressId", required = false, defaultValue = "0") String addressId,
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@RequestParam(value = "userId", required = false, defaultValue = "0") String userId,
@RequestParam(value = "desc", required = false, defaultValue = "0") List<String> desc,
@RequestParam(value = "price", required = false, defaultValue = "0") List<Double> price,
@RequestParam(value = "stock", required = false, defaultValue = "0") List<Integer> stock
) throws UnsupportedEncodingException {
System.out.println("===activity_callback_\n");
System.out.println("===filename: "+filename+"&tag="+tag+"&title="+title+"&content="+content+"&image="+image+"&userId="+userId+"&memberId="+memberId+"&addressId="+addressId);
System.out.println("===filename: "+desc.toString() + price.toString() + stock.toString() );
keyService.Rockwell_keyServiceAddT_activity(userId, memberId, addressId, image, tag, title, content, desc, price, stock);
JSONObject result = new JSONObject();
result.put("Status","OK");
return result;
}
/* /*
添加tbl_member 添加tbl_member
*/ */
...@@ -94,12 +129,15 @@ public class OssApiController { ...@@ -94,12 +129,15 @@ public class OssApiController {
@RequestParam(value = "width", required = false, defaultValue = "0") String width, @RequestParam(value = "width", required = false, defaultValue = "0") String width,
@RequestParam(value = "memberName", required = false, defaultValue = "0") String memberName, @RequestParam(value = "memberName", required = false, defaultValue = "0") String memberName,
@RequestParam(value = "memberAddress", required = false, defaultValue = "0") String memberAddress, @RequestParam(value = "memberAddress", required = false, defaultValue = "0") String memberAddress,
@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 = "memberId", required = false, defaultValue = "0") String memberId @RequestParam(value = "addressId", required = false, defaultValue = "0") String addressId,
@RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId,
@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+"&image="+image+"&memberId="+memberId); System.out.println("=== filename="+filename+"&name="+memberName+"&address="+memberAddress+"&slogan="+memberSlogan+"&image="+image+"&memberId="+memberId+"&userId="+userId+"&addressId="+addressId);
keyService.Rockwell_keyServiceAddT_member(memberId, image, memberName, memberAddress); keyService.Rockwell_keyServiceAddT_member(userId, memberId, addressId, image, memberName, memberAddress, memberSlogan);
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("Status","OK"); result.put("Status","OK");
return result; 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"?>
...@@ -321,6 +321,33 @@ limitations under the License. ...@@ -321,6 +321,33 @@ limitations under the License.
WHERE activity_id=#{activityId} WHERE activity_id=#{activityId}
</select> </select>
<!-- 添加一条activity信息 -->
<insert id="addT_activity" parameterType="cn.com.fun.nyxkey.api.domain.Rockwell_keyT_activity">
insert into tbl_activity(activity_id, activity_status, user_id, member_id, address_id, num_like, tag, note_image, title, content, create_datetime, update_datetime)
values (#{activityId}, #{activityStatus}, #{userId}, #{memberId}, #{addressId}, #{numLike}, #{tag} , #{noteImage}, #{title}, #{content}, #{createDatetime}, #{updateDatetime})
</insert>
<!-- match api2-7 新增多条 product 记录 update jscat 20200902 -->
<insert id="addT_product" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_productQuery">
insert into tbl_product(product_id, activity_id, product_status, default_status, product_desc, unit_price, stock, start_datetime, end_datetime, create_datetime,update_datetime)
values
<foreach collection="listRockwell_keyT_product" index="index" item="item" open="" separator="," close="">
(
#{item.productId},
#{item.activityId},
#{item.productStatus},
#{item.defaultStatus},
#{item.productDesc},
#{item.unitPrice},
#{item.stock},
#{item.startDatetime},
#{item.endDatetime},
#{item.createDatetime},
#{item.updateDatetime}
)
</foreach>
</insert>
<!-- post api 4.1 从 view_post_info 获取 post信息 <!-- post api 4.1 从 view_post_info 获取 post信息
--> -->
<select id="getV_post_info" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_postQuery" resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_post_info"> <select id="getV_post_info" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_postQuery" resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_post_info">
...@@ -436,6 +463,35 @@ limitations under the License. ...@@ -436,6 +463,35 @@ limitations under the License.
values (#{id}, #{memberStatus}, #{memberName} , #{memberSlogan}, #{memberAddress}, #{memberLogo}, #{lon}, #{lat}, #{geoCode}, #{createDatetime}, #{updateDatetime}) values (#{id}, #{memberStatus}, #{memberName} , #{memberSlogan}, #{memberAddress}, #{memberLogo}, #{lon}, #{lat}, #{geoCode}, #{createDatetime}, #{updateDatetime})
</insert> </insert>
<!-- 更新一条tbl_member_user信息 -->
<insert id="updateT_member_user" parameterType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_member_user">
REPLACE into tbl_member_user(member_id, user_id, status, default_member, default_user, create_datetime, update_datetime)
values (#{memberId}, #{userId}, #{status}, #{defaultMember}, #{defaultUser} , #{createDatetime}, #{updateDatetime} )
</insert>
<!-- 添加一条address信息 -->
<insert id="addT_address" parameterType="cn.com.fun.nyxkey.api.domain.Rockwell_keyT_address">
insert into tbl_address(address_id, address_status, address_name, client_id, create_datetime, update_datetime)
values (#{addressId}, #{addressStatus}, #{addressName} , #{clientId}, #{createDatetime}, #{updateDatetime})
</insert>
<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
where 1=1
AND member_status="01"
AND status="01"
<if test="userId != null and userId != '' ">
AND user_id=#{userId}
</if>
<if test="memberId != null and memberId != '' ">
AND member_id=#{memberId}
</if>
order by default_member desc
<if test="pagination != null ">
<include refid="pagination"/>
</if>
</select>
<!-- ending API interface --> <!-- ending API interface -->
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论