From 5001e96ab739aaf8a96069a61741801960f3d371 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 4 Jan 2022 11:11:04 +0800 Subject: [PATCH] adding channdId --- .../module/system/royalcanin/MemberService.java | 11 ----------- .../system/royalcanin/TransitionController.java | 2 +- .../system/royalcanin/member/MemberAddEntity.java | 8 +------- .../system/royalcanin/member/MemberCheckEntity.java | 4 +--- .../system/royalcanin/member/MemberGetEntity.java | 2 +- .../royalcanin/member/MemberUpdateEntity.java | 2 +- .../member/MemberUpdateMemberLevelEntity.java | 6 +----- .../memberAccount/MemberAccountChangeEntity.java | 9 +-------- .../memberAccount/MemberAccountHistoryEntity.java | 8 +------- .../memberAddress/MemberAddressAddEntity.java | 10 +--------- .../memberAddress/MemberAddressDeleteEntity.java | 5 +---- .../memberAddress/MemberAddressGetAllEntity.java | 4 +--- .../memberAddress/MemberAddressUpdateEntity.java | 13 +------------ .../system/royalcanin/orderMaster/QueryEntity.java | 4 ++-- 14 files changed, 14 insertions(+), 74 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index eb2b03ab..01a292cf 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -53,17 +53,6 @@ public class MemberService { JSONObject json = JSONObject.parseObject(jsonObject.getString("data")); String id = json.getString("id"); jsonObject.put("xaccessToken",generateToken(id)); - UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent")); - UserLoginLogEntity logEntity = - UserLoginLogEntity.builder() - .userId(Long.parseLong(id)) - .userName(json.getString("memberName")) - .remoteIp(SmartIPUtil.getRemoteIp(request)) - .remotePort(request.getRemotePort()) - .remoteBrowser(userAgent.getBrowser().getName()) - .remoteOs(userAgent.getOperatingSystem().getName()) - .loginStatus(JudgeEnum.YES.getValue()).build(); - logService.addLog(logEntity); return jsonObject.toJSONString(); }else { return sb; 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 969e7076..e678a969 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 @@ -202,7 +202,7 @@ public class TransitionController { @ApiOperation(value = "订单信息", notes = "查询订单信息,新增或者更新订单信息") @PostMapping("royalcanin/orderMaster") - public String transferOrderMaster(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { + public String transferOrderMaster(String type ,@RequestBody Object object) throws Exception { ObjectMapper objectMapper = new ObjectMapper(); String result = "null"; switch (type) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java index 316f4d1e..f64140ec 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberAddEntity.java @@ -20,36 +20,30 @@ public class MemberAddEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员名称 */ - @ApiModelProperty(example = "李海瑞") private String memberName; /** * 真实姓名 */ - @ApiModelProperty(example = "李海瑞") private String realName; /** * 会员手机号 */ - @ApiModelProperty(example = "18280219507") private String mobile; /** * 性别 0女 1男 */ - @ApiModelProperty(example = "0") private int gender; /** * 会员邮箱 */ - @ApiModelProperty(example = "abc@gmail.com") private String email; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java index dcfe57b4..8b0fe440 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberCheckEntity.java @@ -15,14 +15,12 @@ public class MemberCheckEntity { * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 电话 */ - @ApiModelProperty(example = "18112621098") private String mobile; /** diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java index abf9d034..47a473b2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberGetEntity.java @@ -17,7 +17,7 @@ public class MemberGetEntity { * 渠道 */ @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员id */ diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java index 6ab2c6eb..f7ad31c3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class MemberUpdateEntity { - private int channelId; + private int channelId = 15; private int id ; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateMemberLevelEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateMemberLevelEntity.java index c69225e6..b4867de7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateMemberLevelEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateMemberLevelEntity.java @@ -10,24 +10,20 @@ import lombok.Data; @Data public class MemberUpdateMemberLevelEntity { - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 渠道秘钥 */ - @ApiModelProperty(example = "111111") private String channelSecurity; /** * 会员id */ - @ApiModelProperty(example = "844357") private int id ; /** * 会员等级'1:普通 2:银卡 3:金卡 */ - @ApiModelProperty(example = "1") private int memberLevel; } 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 index 02b36f12..9a678d99 100644 --- 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 @@ -16,43 +16,36 @@ public class MemberAccountChangeEntity { * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "844350") private int memberId; /** * 积分变更类型 */ - @ApiModelProperty(example = "1") private int changeTypeId; /** * 积分增加/减少数量 */ - @ApiModelProperty(example = "100") private BigDecimal changeValue; /** * 积分明细 */ - @ApiModelProperty(example = "备注") private String remark; /** * 积分失效期 */ - @ApiModelProperty(example = "2019-07-23") private String startDate; /** * 积分失效期 */ - @ApiModelProperty(example = "2020-07-23") 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 index 7d4ffe3a..b5c966ac 100644 --- 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 @@ -12,37 +12,31 @@ public class MemberAccountHistoryEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "223782") private int memberId; /** * 变更类型ID */ - @ApiModelProperty(example = "23") private int changeTypeId; /** * 变更类型父ID */ - @ApiModelProperty(example = "1") private int changeTypeParentId; /** * 每页条数 */ - @ApiModelProperty(example = "15") private int rows; /** * 页码 */ - @ApiModelProperty(example = "1") 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 index 57090409..c09df093 100644 --- 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 @@ -9,49 +9,41 @@ public class MemberAddressAddEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "3242") private int memberId; /** * 省份ID */ - @ApiModelProperty(example = "25") private String provinceId; /** * 城市ID */ - @ApiModelProperty(example = "2") private int cityId; /** * 区ID */ - @ApiModelProperty(example = "2607") private int districtId; /** * 地址 */ - @ApiModelProperty(example = "古美路1455弄46号302") private String detailAddress; /** * 收件人姓名 */ - @ApiModelProperty(example = "蒋缘缘2") private String recipient; /** * 收件人手机号 */ - @ApiModelProperty(example = "13671516167") private String recipientPhone; /** 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 index c06cce43..8e4ca5bd 100644 --- 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 @@ -12,18 +12,15 @@ public class MemberAddressDeleteEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "1") private int memberId; /** * 宠物ID */ - @ApiModelProperty(example = "1") 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 index e5706266..a8e03143 100644 --- 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 @@ -14,12 +14,10 @@ public class MemberAddressGetAllEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "23423") 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 index 21ad3732..29fc9818 100644 --- 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 @@ -12,67 +12,56 @@ public class MemberAddressUpdateEntity { /** * 渠道 */ - @ApiModelProperty(example = "2") - private int channelId; + private int channelId = 15; /** * 会员ID */ - @ApiModelProperty(example = "3242") private int memberId; /** * 会员地址ID */ - @ApiModelProperty(example = "620111") private int id; /** * 省份ID */ - @ApiModelProperty(example = "25") private String provinceId; /** * 城市ID */ - @ApiModelProperty(example = "2") private int cityId; /** * 区ID */ - @ApiModelProperty(example = "2607") private int districtId; /** * 地址 */ - @ApiModelProperty(example = "古美路1455弄46号302") private String detailAddress; /** * 收件人姓名 */ - @ApiModelProperty(example = "蒋缘缘3") private String recipient; /** * 收件人手机号 */ - @ApiModelProperty(example = "13671516167") private String recipientPhone; /** * 邮编 */ - @ApiModelProperty(example = "214423") private String zipCode; /** * 是否默认地址 */ - @ApiModelProperty(example = "true") private boolean isDefault; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/QueryEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/QueryEntity.java index 6f810fe9..61bf8212 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/QueryEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/QueryEntity.java @@ -5,9 +5,9 @@ import lombok.Data; @Data public class QueryEntity { - private String channelId; + private String channelId = "15"; - private String secret; + private String secret = "H5@2021"; private String orderNumber;