From 028a785469b3fb1535dfdadf97adffa8e9818572 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 6 Dec 2021 19:11:29 +0800 Subject: [PATCH] coupon+couponConfig+memberAccount+memberAddress --- .../royalcanin/CouponConfigService.java | 35 +++++ .../system/royalcanin/CouponService.java | 105 ++++++++++++++ .../module/system/royalcanin/HttpClient.java | 133 ------------------ .../system/royalcanin/MamberService.java | 6 +- .../royalcanin/MemberAccountService.java | 42 ++++++ .../royalcanin/MemberAddressService.java | 68 +++++++++ .../royalcanin/TransitionController.java | 72 +++++++++- .../royalcanin/coupon/CouponCancelEntity.java | 27 ++++ .../royalcanin/coupon/CouponCosumeEntity.java | 69 +++++++++ .../royalcanin/coupon/CouponFetchEntity.java | 36 +++++ .../royalcanin/coupon/CouponGetAllEntity.java | 93 ++++++++++++ .../royalcanin/coupon/CouponGetEntity.java | 25 ++++ .../coupon/CouponV2GetAllEntity.java | 84 +++++++++++ .../CouponConfigFindAllEntity.java | 42 ++++++ .../couponConfig/CouponConfigGetEntity.java | 28 ++++ .../{domain => }/member/MemberAddEntity.java | 2 +- .../member/MemberCheckEntity.java | 2 +- .../{domain => }/member/MemberGetEntity.java | 2 +- .../MemberAccountChangeEntity.java | 49 +++++++ .../MemberAccountHistoryEntity.java | 42 ++++++ .../memberAddress/MemberAddressAddEntity.java | 63 +++++++++ .../MemberAddressDeleteEntity.java | 25 ++++ .../MemberAddressGetAllEntity.java | 22 +++ .../MemberAddressUpdateEntity.java | 66 +++++++++ 24 files changed, 995 insertions(+), 143 deletions(-) create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java delete mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/HttpClient.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCancelEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCosumeEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponFetchEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponV2GetAllEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigGetEntity.java rename smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/{domain => }/member/MemberAddEntity.java (95%) rename smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/{domain => }/member/MemberCheckEntity.java (83%) rename smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/{domain => }/member/MemberGetEntity.java (87%) create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountChangeEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountHistoryEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressAddEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressDeleteEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressGetAllEntity.java create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java new file mode 100644 index 00000000..8bff7922 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java @@ -0,0 +1,35 @@ +package net.lab1024.smartadmin.module.system.royalcanin; + +import net.lab1024.smartadmin.common.heartbeat.StringUtil; +import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigFindAllEntity; +import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigGetEntity; +import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class CouponConfigService { + + private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; + + public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponConfigGetEntity.getChannelId())); + paramMap.put("channelSecurity", couponConfigGetEntity.getChannelSecurity()); + paramMap.put("couponId", StringUtil.toString(couponConfigGetEntity.getCouponId())); + return SmartHttpUtil.sendPostForm(url+"get",paramMap,null); + } + + public String couponConfigFindAll(CouponConfigFindAllEntity couponConfigFindAllEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponConfigFindAllEntity.getChannelId())); + paramMap.put("channelSecurity", couponConfigFindAllEntity.getChannelSecurity()); + paramMap.put("memberTagId", StringUtil.toString(couponConfigFindAllEntity.getMemberTagId())); + paramMap.put("memberId", StringUtil.toString(couponConfigFindAllEntity.getMemberId())); + paramMap.put("rows", StringUtil.toString(couponConfigFindAllEntity.getRows())); + paramMap.put("page", StringUtil.toString(couponConfigFindAllEntity.getPage())); + return SmartHttpUtil.sendPostForm(url+"findAll",paramMap,null); + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java new file mode 100644 index 00000000..594f2a9d --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -0,0 +1,105 @@ +package net.lab1024.smartadmin.module.system.royalcanin; + +import net.lab1024.smartadmin.common.heartbeat.StringUtil; +import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; +import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class CouponService { + + private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; + + public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponCancelEntity.getChannelId())); + paramMap.put("channelSecurity", couponCancelEntity.getChannelSecurity()); + paramMap.put("couponCode", couponCancelEntity.getCouponCode()); + return SmartHttpUtil.sendPostForm(url+"cancel",paramMap,null); + } + + public String couponCosume(CouponCosumeEntity couponCosumeEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponCosumeEntity.getChannelId())); + paramMap.put("channelSecurity", couponCosumeEntity.getChannelSecurity()); + paramMap.put("couponCode", couponCosumeEntity.getCouponCode()); + paramMap.put("brandCode", couponCosumeEntity.getBrandCode()); + paramMap.put("storeCode", couponCosumeEntity.getStoreCode()); + paramMap.put("orderNo", couponCosumeEntity.getOrderNo()); + paramMap.put("realCouponAmount", StringUtil.toString(couponCosumeEntity.getRealCouponAmount())); + paramMap.put("petCategoryId", StringUtil.toString(couponCosumeEntity.getPetCategoryId())); + paramMap.put("petBodySizeId", StringUtil.toString(couponCosumeEntity.getPetBodySizeId())); + paramMap.put("petTypeCode", couponCosumeEntity.getPetTypeCode()); + return SmartHttpUtil.sendPostForm(url+"consume",paramMap,null); + } + + public String couponFetch(CouponFetchEntity couponFetchEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponFetchEntity.getChannelId())); + paramMap.put("channelSecurity", couponFetchEntity.getChannelSecurity()); + paramMap.put("memberId", StringUtil.toString(couponFetchEntity.getMemberId())); + paramMap.put("mobile", couponFetchEntity.getMobile()); + paramMap.put("couponId", couponFetchEntity.getCouponId()); + return SmartHttpUtil.sendPostForm(url+"fetch",paramMap,null); + } + + public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponGetAllEntity.getChannelId())); + paramMap.put("channelSecurity", couponGetAllEntity.getChannelSecurity()); + paramMap.put("memberId", StringUtil.toString(couponGetAllEntity.getMemberId())); + paramMap.put("mobile", couponGetAllEntity.getMobile()); + paramMap.put("couponId", couponGetAllEntity.getCouponId()); + paramMap.put("couponCode", couponGetAllEntity.getCouponCode()); + paramMap.put("status", StringUtil.toString(couponGetAllEntity.getStatus())); + paramMap.put("isUsed", StringUtil.toString(couponGetAllEntity.isUsed())); + paramMap.put("isValid", StringUtil.toString(couponGetAllEntity.isValid())); + paramMap.put("isUsedOrValid", StringUtil.toString(couponGetAllEntity.isUsedOrValid())); + paramMap.put("udf1", couponGetAllEntity.getUdf1()); + paramMap.put("udf2", couponGetAllEntity.getUdf2()); + paramMap.put("udf3", couponGetAllEntity.getUdf3()); + paramMap.put("createStartDate", couponGetAllEntity.getCreateStartDate()); + paramMap.put("createEndDate", couponGetAllEntity.getCreateEndDate()); + paramMap.put("useStartDate", couponGetAllEntity.getUseStartDate()); + paramMap.put("useEndDate", couponGetAllEntity.getUseEndDate()); + paramMap.put("rows", StringUtil.toString(couponGetAllEntity.getRows())); + paramMap.put("page", StringUtil.toString(couponGetAllEntity.getPage())); + return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); + } + + public String couponGet(CouponGetEntity couponGetEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponGetEntity.getChannelId())); + paramMap.put("channelSecurity", couponGetEntity.getChannelSecurity()); + paramMap.put("couponCode", couponGetEntity.getCouponCode()); + paramMap.put("storeCode", couponGetEntity.getStoreCode()); + return SmartHttpUtil.sendPostForm(url+"get",paramMap,null); + } + + + public String couponV2GetAll(CouponV2GetAllEntity couponV2GetAllEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(couponV2GetAllEntity.getChannelId())); + paramMap.put("channelSecurity", couponV2GetAllEntity.getChannelSecurity()); + paramMap.put("memberId", StringUtil.toString(couponV2GetAllEntity.getMemberId())); + paramMap.put("mobile", couponV2GetAllEntity.getMobile()); + paramMap.put("couponId", couponV2GetAllEntity.getCouponId()); + paramMap.put("activityId", StringUtil.toString(couponV2GetAllEntity.getActivityId())); + paramMap.put("useStoreCode", couponV2GetAllEntity.getUseStoreCode()); + paramMap.put("storeCode", couponV2GetAllEntity.getStoreCode()); + paramMap.put("status", StringUtil.toString(couponV2GetAllEntity.getStatus())); + paramMap.put("isUsed", StringUtil.toString(couponV2GetAllEntity.isUsed())); + paramMap.put("isValid", StringUtil.toString(couponV2GetAllEntity.isValid())); + paramMap.put("udf1", couponV2GetAllEntity.getUdf1()); + paramMap.put("udf2", couponV2GetAllEntity.getUdf2()); + paramMap.put("udf3", couponV2GetAllEntity.getUdf3()); + paramMap.put("useStartDate", couponV2GetAllEntity.getUseStartDate()); + paramMap.put("useEndDate", couponV2GetAllEntity.getUseEndDate()); + paramMap.put("rows", StringUtil.toString(couponV2GetAllEntity.getRows())); + paramMap.put("page", StringUtil.toString(couponV2GetAllEntity.getPage())); + return SmartHttpUtil.sendPostForm(url+"v2/getAll",paramMap,null); + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/HttpClient.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/HttpClient.java deleted file mode 100644 index 0fb922ba..00000000 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/HttpClient.java +++ /dev/null @@ -1,133 +0,0 @@ -package net.lab1024.smartadmin.module.system.royalcanin; - -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; - -import java.io.*; -import java.util.*; - -public class HttpClient { - public static String doGet(String url) { - CloseableHttpClient httpClient = null; - CloseableHttpResponse response = null; - String result = ""; - try { - // 通过址默认配置创建一个httpClient实例 - httpClient = HttpClients.createDefault(); - // 创建httpGet远程连接实例 - HttpGet httpGet = new HttpGet(url); - // 设置请求头信息，鉴权 - httpGet.setHeader("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0"); - // 设置配置请求参数 - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000)// 连接主机服务超时时间 - .setConnectionRequestTimeout(35000)// 请求超时时间 - .setSocketTimeout(60000)// 数据读取超时时间 - .build(); - // 为httpGet实例设置配置 - httpGet.setConfig(requestConfig); - // 执行get请求得到返回对象 - response = httpClient.execute(httpGet); - // 通过返回对象获取返回数据 - HttpEntity entity = response.getEntity(); - // 通过EntityUtils中的toString方法将结果转换为字符串 - result = EntityUtils.toString(entity); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - // 关闭资源 - if (null != response) { - try { - response.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (null != httpClient) { - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return result; - } - - public static String doPost(String url, Map paramMap) { - CloseableHttpClient httpClient = null; - CloseableHttpResponse httpResponse = null; - String result = ""; - // 创建httpClient实例 - httpClient = HttpClients.createDefault(); - // 创建httpPost远程连接实例 - HttpPost httpPost = new HttpPost(url); - // 配置请求参数实例 - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000)// 设置连接主机服务超时时间 - .setConnectionRequestTimeout(35000)// 设置连接请求超时时间 - .setSocketTimeout(60000)// 设置读取数据连接超时时间 - .build(); - // 为httpPost实例设置配置 - httpPost.setConfig(requestConfig); - // 设置请求头 - httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded"); - // 封装post请求参数 - if (null != paramMap && paramMap.size() > 0) { - List nvps = new ArrayList(); - // 通过map集成entrySet方法获取entity - Set> entrySet = paramMap.entrySet(); - // 循环遍历，获取迭代器 - Iterator> iterator = entrySet.iterator(); - while (iterator.hasNext()) { - Map.Entry mapEntry = iterator.next(); - nvps.add(new BasicNameValuePair(mapEntry.getKey(), mapEntry.getValue().toString())); - } - - // 为httpPost设置封装好的请求参数 - try { - httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8")); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - } - try { - // httpClient对象执行post请求,并返回响应参数对象 - httpResponse = httpClient.execute(httpPost); - // 从响应对象中获取响应内容 - HttpEntity entity = httpResponse.getEntity(); - result = EntityUtils.toString(entity); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - // 关闭资源 - if (null != httpResponse) { - try { - httpResponse.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (null != httpClient) { - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return result; - } -} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MamberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MamberService.java index b021c638..1922af17 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MamberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MamberService.java @@ -1,9 +1,9 @@ package net.lab1024.smartadmin.module.system.royalcanin; import net.lab1024.smartadmin.common.heartbeat.StringUtil; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberAddEntity; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberCheckEntity; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberGetEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberAddEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberCheckEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberGetEntity; import net.lab1024.smartadmin.util.SmartHttpUtil; import org.springframework.stereotype.Service; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java new file mode 100644 index 00000000..91d4d7be --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java @@ -0,0 +1,42 @@ +package net.lab1024.smartadmin.module.system.royalcanin; + +import net.lab1024.smartadmin.common.heartbeat.StringUtil; +import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountHistoryEntity; +import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + * 会员积分变更 + */ +@Service +public class MemberAccountService { + + private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/"; + + public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(memberAccountChangeEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAccountChangeEntity.getChannelId())); + paramMap.put("changeTypeId",StringUtil.toString(memberAccountChangeEntity.getChangeTypeId())); + paramMap.put("changeValue",StringUtil.toString(memberAccountChangeEntity.getChangeValue())); + paramMap.put("remark",memberAccountChangeEntity.getRemark()); + paramMap.put("startDate",memberAccountChangeEntity.getStartDate()); + paramMap.put("endDate",memberAccountChangeEntity.getEndDate()); + return SmartHttpUtil.sendPostForm(url+"change",paramMap,null); + } + + public String memberAccountHistory(MemberAccountHistoryEntity memberAccountHistoryEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(memberAccountHistoryEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAccountHistoryEntity.getChannelId())); + paramMap.put("changeTypeId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId())); + paramMap.put("changeTypeParentId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId())); + paramMap.put("rows",StringUtil.toString(memberAccountHistoryEntity.getRows())); + paramMap.put("page",StringUtil.toString(memberAccountHistoryEntity.getPage())); + return SmartHttpUtil.sendPostForm(url+"history",paramMap,null); + } +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java new file mode 100644 index 00000000..34d9b3b1 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java @@ -0,0 +1,68 @@ +package net.lab1024.smartadmin.module.system.royalcanin; + +import net.lab1024.smartadmin.common.heartbeat.StringUtil; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressAddEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressDeleteEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressGetAllEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressUpdateEntity; +import net.lab1024.smartadmin.util.SmartHttpUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class MemberAddressService { + private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/"; + + + public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception { + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(memberAddressGetAllEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAddressGetAllEntity.getMemberId())); + return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); + } + + public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId",StringUtil.toString(memberAddressAddEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAddressAddEntity.getMemberId())); + paramMap.put("provinceId",StringUtil.toString(memberAddressAddEntity.getProvinceId())); + paramMap.put("cityId",StringUtil.toString(memberAddressAddEntity.getCityId())); + paramMap.put("districtId",StringUtil.toString(memberAddressAddEntity.getDistrictId())); + paramMap.put("detailAddress",memberAddressAddEntity.getDetailAddress()); + paramMap.put("recipient",memberAddressAddEntity.getRecipient()); + paramMap.put("recipientPhone",memberAddressAddEntity.getRecipientPhone()); + paramMap.put("zipCode",memberAddressAddEntity.getZipCode()); + paramMap.put("isDefault",StringUtil.toString(memberAddressAddEntity.isDefault())); + paramMap.put("registerDate",memberAddressAddEntity.getRegisterDate()); + return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); + } + + public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId",StringUtil.toString(memberAddressUpdateEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAddressUpdateEntity.getMemberId())); + paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.getId())); + paramMap.put("provinceId",StringUtil.toString(memberAddressUpdateEntity.getProvinceId())); + paramMap.put("cityId",StringUtil.toString(memberAddressUpdateEntity.getCityId())); + paramMap.put("districtId",StringUtil.toString(memberAddressUpdateEntity.getDistrictId())); + paramMap.put("detailAddress",memberAddressUpdateEntity.getDetailAddress()); + paramMap.put("recipient",memberAddressUpdateEntity.getRecipient()); + paramMap.put("recipientPhone",memberAddressUpdateEntity.getRecipientPhone()); + paramMap.put("zipCode",memberAddressUpdateEntity.getZipCode()); + paramMap.put("isDefault",StringUtil.toString(memberAddressUpdateEntity.isDefault())); + return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); + } + + @Transactional(rollbackFor = Exception.class) + public String memberAddressDelete(MemberAddressDeleteEntity memberAddressDeleteEntity) throws Exception{ + Map paramMap = new HashMap<>(); + paramMap.put("channelId", StringUtil.toString(memberAddressDeleteEntity.getChannelId())); + paramMap.put("memberId",StringUtil.toString(memberAddressDeleteEntity.getMemberId())); + return SmartHttpUtil.sendPostForm(url+"delete",paramMap,null); + } + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index db5bd734..185c8e60 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -5,9 +5,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.common.anno.OperateLog; import net.lab1024.smartadmin.constant.SwaggerTagConst; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberAddEntity; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberCheckEntity; -import net.lab1024.smartadmin.module.system.royalcanin.domain.member.MemberGetEntity; +import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigFindAllEntity; +import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigGetEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberAddEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberCheckEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.MemberGetEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountHistoryEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressAddEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressDeleteEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressGetAllEntity; +import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressUpdateEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,9 +30,18 @@ public class TransitionController { @Autowired private MamberService mamberService; + @Autowired + private MemberAddressService memberAddressService; + + @Autowired + private MemberAccountService memberAccountService; + + @Autowired + private CouponConfigService couponConfigService; + @ApiOperation(value = "会员信息", notes = "会员查询，验证会员信息，会员注册") @PostMapping("royalcanin/member") - public String transferMember(String type ,@RequestBody Object object) throws Exception { + private String transferMember(String type ,@RequestBody Object object) throws Exception { ObjectMapper objectMapper = new ObjectMapper(); switch (type) { @@ -37,4 +54,51 @@ public class TransitionController { } return "null"; } + + @ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址") + @PostMapping("royalcanin/memberAddress") + private String transferMemberAddress(String type ,@RequestBody Object object) throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + switch (type) + { + case "getAll": + return memberAddressService.membberAddressGetAll(objectMapper.convertValue(object, MemberAddressGetAllEntity.class)); + case "add": + return memberAddressService.memberAddressAdd(objectMapper.convertValue(object,MemberAddressAddEntity.class)); + case "update": + return memberAddressService.memberAddressUpdate(objectMapper.convertValue(object, MemberAddressUpdateEntity.class)); + case "delete": + return memberAddressService.memberAddressDelete(objectMapper.convertValue(object, MemberAddressDeleteEntity.class)); + } + return "null"; + } + + @ApiOperation(value = "会员积分", notes = "会员积分明细，会员积分变更") + @PostMapping("royalcanin/memberAccount") + private String transferMemberAccount(String type ,@RequestBody Object object) throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + switch (type) + { + case "change": + return memberAccountService.memberAccountChange(objectMapper.convertValue(object, MemberAccountChangeEntity.class)); + case "history": + return memberAccountService.memberAccountHistory(objectMapper.convertValue(object, MemberAccountHistoryEntity.class)); + } + return "null"; + } + + + @ApiOperation(value = "优惠券种类", notes = "查询所有优惠券种类,查询单条优惠券种类") + @PostMapping("royalcanin/couponConfig") + private String transferCouponConfig(String type ,@RequestBody Object object) throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + switch (type) + { + case "change": + return couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); + case "history": + return couponConfigService.couponConfigGet(objectMapper.convertValue(object, CouponConfigGetEntity.class)); + } + return "null"; + } } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCancelEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCancelEntity.java new file mode 100644 index 00000000..c4ddfbf4 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCancelEntity.java @@ -0,0 +1,27 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +/** + * 取消优惠券 + * @Author Carl + */ +@Data +public class CouponCancelEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 优惠券code + */ + private String couponCode; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCosumeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCosumeEntity.java new file mode 100644 index 00000000..f9dcd19c --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponCosumeEntity.java @@ -0,0 +1,69 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 使用优惠券 + * @author Carl + */ +@Data +public class CouponCosumeEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 优惠券code + */ + private String couponCode; + + /** + * 品牌编码 + */ + private String brandCode; + + /** + * 门店编码 + */ + private String storeCode; + + /** + * 产品编码 + */ + private String productCode; + + /** + * 订单号 + */ + private String orderNo; + + /** + * 实际优惠金额 + */ + private BigDecimal realCouponAmount; + + /** + * 宠物类别ID + */ + private int petCategoryId; + + /** + * 宠物体型ID + */ + private int petBodySizeId; + + /** + * 宠物类型编码 + */ + private String petTypeCode; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponFetchEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponFetchEntity.java new file mode 100644 index 00000000..79b80cd7 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponFetchEntity.java @@ -0,0 +1,36 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +/** + * 领取优惠券 + * @Author Carl + */ +@Data +public class CouponFetchEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 会员ID + */ + private int memberId; + + /** + * 手机号码 + */ + private String mobile; + + /** + * 优惠券Id + */ + private String couponId; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java new file mode 100644 index 00000000..e467674a --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java @@ -0,0 +1,93 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +/** + * 查询用户优惠券 + * @Author Carl + */ +@Data +public class CouponGetAllEntity { + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 会员ID + */ + private int memberId; + + /** + * 手机号码 + */ + private String mobile; + + /** + * 优惠券类别 + */ + private String couponId; + + /** + * 优惠券code + */ + private String couponCode; + + /** + * 0:未使用,1已使用,2已作废 + */ + private int status; + + /** + * 是否已经使用 + */ + private boolean isUsed; + + /** + * 是否有效(未使用并且未过期) + */ + private boolean isValid; + + /** + * 已经使用或者未过期 + */ + private boolean isUsedOrValid; + + /** + * 用户自定义字段 + */ + private String udf1; + + private String udf2; + + private String udf3; + + /** + * 优惠券领取开始时间 + */ + private String createStartDate; + + /** + * 优惠券领取结束时间 + */ + private String createEndDate; + + /** + * 优惠券使用开始日期 + */ + private String useStartDate; + + /** + * 优惠券使用结束日期 + */ + private String useEndDate; + + private int rows; + + private int page; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetEntity.java new file mode 100644 index 00000000..d825a9e1 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetEntity.java @@ -0,0 +1,25 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +/** + * 查询单条优惠券 + * @Auhor Carl + */ +@Data +public class CouponGetEntity { + + private int channelId; + + private String channelSecurity; + + /** + * 优惠券编码 + */ + private String couponCode; + + /** + * 门店编码 + */ + private String storeCode; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponV2GetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponV2GetAllEntity.java new file mode 100644 index 00000000..577ce0b3 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponV2GetAllEntity.java @@ -0,0 +1,84 @@ +package net.lab1024.smartadmin.module.system.royalcanin.coupon; + +import lombok.Data; + +@Data +public class CouponV2GetAllEntity { + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 会员ID + */ + private int memberId; + + /** + * 手机号码 + */ + private String mobile; + + /** + * 优惠券类别 + */ + private String couponId; + + /** + * 优惠券活动类型 + */ + private int activityId; + + /** + * 核销门店code + */ + private String useStoreCode; + + /** + * 适用门店code + */ + private String storeCode; + + /** + * 0:未使用,1已使用,2已作废 + */ + private int status; + + /** + * 是否已经使用 + */ + private boolean isUsed; + + /** + * 是否有效(未使用并且未过期) + */ + private boolean isValid; + + /** + * 用户自定义字段 + */ + private String udf1; + + private String udf2; + + private String udf3; + + /** + * 优惠券使用开始日期 + */ + private String useStartDate; + + /** + * 优惠券使用结束日期 + */ + private String useEndDate; + + private int rows; + + private int page; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java new file mode 100644 index 00000000..f96178f0 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigFindAllEntity.java @@ -0,0 +1,42 @@ +package net.lab1024.smartadmin.module.system.royalcanin.couponConfig; + +import lombok.Data; + +/** + * 优惠券类别查询接口 + * @Author Carl + */ +@Data +public class CouponConfigFindAllEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 会员标签Id + */ + private int memberTagId; + + /** + * 会员ID + */ + private int memberId; + + /** + * 每页条数 + */ + private int rows; + + /** + * 页码 + */ + private int page; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigGetEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigGetEntity.java new file mode 100644 index 00000000..4116afe7 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/couponConfig/CouponConfigGetEntity.java @@ -0,0 +1,28 @@ +package net.lab1024.smartadmin.module.system.royalcanin.couponConfig; + +import lombok.Data; + +/** + * 查询单条优惠券种类 + * @Author Carl + */ +@Data +public class CouponConfigGetEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 渠道秘钥 + */ + private String channelSecurity; + + /** + * 优惠券id + */ + private String couponId; + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberAddEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java similarity index 95% rename from smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberAddEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java index 093180da..3d90f37d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberAddEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.module.system.royalcanin.domain.member; +package net.lab1024.smartadmin.module.system.royalcanin.member; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberCheckEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java similarity index 83% rename from smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberCheckEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java index 208951c3..2761c686 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberCheckEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.module.system.royalcanin.domain.member; +package net.lab1024.smartadmin.module.system.royalcanin.member; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberGetEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java similarity index 87% rename from smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberGetEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java index 4cfde212..cc045fc7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/member/MemberGetEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.module.system.royalcanin.domain.member; +package net.lab1024.smartadmin.module.system.royalcanin.member; import lombok.Data; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountChangeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountChangeEntity.java new file mode 100644 index 00000000..ef33947b --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountChangeEntity.java @@ -0,0 +1,49 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAccount; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 会员积分变更 + * @Author Carl + */ +@Data +public class MemberAccountChangeEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 会员ID + */ + private int memberId; + + /** + * 积分变更类型 + */ + private int changeTypeId; + + /** + * 积分增加/减少数量 + */ + private BigDecimal changeValue; + + /** + * 积分明细 + */ + private String remark; + + /** + * 积分失效期 + */ + private String startDate; + + /** + * 积分失效期 + */ + private String endDate; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountHistoryEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountHistoryEntity.java new file mode 100644 index 00000000..cf7b6724 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAccount/MemberAccountHistoryEntity.java @@ -0,0 +1,42 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAccount; + +import lombok.Data; + +/** + * 查询会员积分明细 + */ +@Data +public class MemberAccountHistoryEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 会员ID + */ + private int memberId; + + /** + * 变更类型ID + */ + private int changeTypeId; + + /** + * 变更类型父ID + */ + private int changeTypeParentId; + + /** + * 每页条数 + */ + private int rows; + + /** + * 页码 + */ + private int page; + + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressAddEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressAddEntity.java new file mode 100644 index 00000000..4f13ccde --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressAddEntity.java @@ -0,0 +1,63 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAddress; + +import lombok.Data; + +@Data +public class MemberAddressAddEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 会员ID + */ + private int memberId; + + /** + * 省份ID + */ + private String provinceId; + + /** + * 城市ID + */ + private int cityId; + + /** + * 区ID + */ + private int districtId; + + /** + * 地址 + */ + private String detailAddress; + + /** + * 收件人姓名 + */ + private String recipient; + + /** + * 收件人手机号 + */ + private String recipientPhone; + + /** + * 邮编 + */ + private String zipCode; + + /** + * 是否默认地址 + */ + private boolean isDefault; + + /** + * yyyy-MM-dd HH:mm:ss + */ + private String registerDate; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressDeleteEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressDeleteEntity.java new file mode 100644 index 00000000..5d8b6e5e --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressDeleteEntity.java @@ -0,0 +1,25 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAddress; + +import lombok.Data; + +/** + * 删除会员地址接口 + */ +@Data +public class MemberAddressDeleteEntity { + + /** + * 渠道 + */ + private int channelId; + /** + * 会员ID + */ + private int memberId; + + /** + * 宠物ID + */ + private String ids; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressGetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressGetAllEntity.java new file mode 100644 index 00000000..4f153951 --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressGetAllEntity.java @@ -0,0 +1,22 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAddress; + +import lombok.Data; + +/** + * 查询会员地址信息 + @author Carl + @date 2021-12-6 + */ +@Data +public class MemberAddressGetAllEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 会员ID + */ + private int memberId; +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java new file mode 100644 index 00000000..641d41fb --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/memberAddress/MemberAddressUpdateEntity.java @@ -0,0 +1,66 @@ +package net.lab1024.smartadmin.module.system.royalcanin.memberAddress; + +import lombok.Data; + +/** + * 更新会员地址 + */ +@Data +public class MemberAddressUpdateEntity { + + /** + * 渠道 + */ + private int channelId; + + /** + * 会员ID + */ + private int memberId; + + /** + * 会员地址ID + */ + private int id; + + /** + * 省份ID + */ + private String provinceId; + + /** + * 城市ID + */ + private int cityId; + + /** + * 区ID + */ + private int districtId; + + /** + * 地址 + */ + private String detailAddress; + + /** + * 收件人姓名 + */ + private String recipient; + + /** + * 收件人手机号 + */ + private String recipientPhone; + + /** + * 邮编 + */ + private String zipCode; + + /** + * 是否默认地址 + */ + private boolean isDefault; + +}