adding channdId

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;

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)

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 = 15;
-    private int channelId;
     /**
      * 会员名称
      */
-    @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;
 
     /**

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 = 15;
-    private int channelId;
 
     /**
      * 电话
      */
 
-    @ApiModelProperty(example = "18112621098")
     private String mobile;
 
     /**

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
      */

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 ;
 

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 =  15;
-    private int channelId;
 
     /**
      * 渠道秘钥
      */
-    @ApiModelProperty(example = "111111")
     private String channelSecurity;
 
     /**
      * 会员id
      */
-    @ApiModelProperty(example = "844357")
     private int id ;
 
     /**
      * 会员等级'1:普通 2:银卡 3:金卡
      */
-    @ApiModelProperty(example = "1")
     private int memberLevel;
 }

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 = 15;
-    private int channelId;
 
     /**
      * 会员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;
 
 }

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 = 15;
-    private int channelId;
 
     /**
      * 会员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;
 
 

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 = 15;
-    private int channelId;
 
     /**
      * 会员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;
 
     /**

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 = 15;
-    private int channelId;
     /**
      * 会员ID
      */
-    @ApiModelProperty(example = "1")
     private int memberId;
 
     /**
      * 宠物ID
      */
-    @ApiModelProperty(example = "1")
     private String ids;
 
 }

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  = 15;
-    private int channelId;
 
     /**
      * 会员ID
      */
-    @ApiModelProperty(example = "23423")
     private int memberId;
 }

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 = 15;
-    private int channelId;
 
     /**
      * 会员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;
 
 }

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;