From 4f08e07892280089c6931ca187c2fcfc15b0e8d5 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Thu, 9 Dec 2021 16:34:02 +0800 Subject: [PATCH] adding coupon script --- .../royalcanin/CouponConfigService.java | 17 ++-- .../system/royalcanin/CouponService.java | 83 ++++------------ .../royalcanin/MemberAccountService.java | 21 ++-- .../royalcanin/MemberAddressService.java | 33 +------ .../system/royalcanin/MemberService.java | 95 +++++++------------ .../royalcanin/TransitionController.java | 57 +++++++++-- .../royalcanin/member/MemberUpdateEntity.java | 46 +++++++++ .../smartadmin/util/MapRemoveNullUtil.java | 40 ++++++++ 8 files changed, 204 insertions(+), 188 deletions(-) create mode 100644 smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.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 index 1f6faaa0..e91784cb 100644 --- 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 @@ -16,22 +16,17 @@ 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); MapRemoveNullUtil.removeNullEntry(paramMap); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigFindAllEntity); + paramMap.put("memberTagId",StringUtil.toString(couponConfigFindAllEntity.getMemberTagId()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getMemberTagId())); + paramMap.put("memberId",StringUtil.toString(couponConfigFindAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getMemberId())); + paramMap.put("rows",StringUtil.toString(couponConfigFindAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getRows())); + paramMap.put("page",StringUtil.toString(couponConfigFindAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getPage())); MapRemoveNullUtil.removeNullEntry(paramMap); 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 index 594f2a9d..78b659c7 100644 --- 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 @@ -2,6 +2,7 @@ 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.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; import org.springframework.stereotype.Service; @@ -14,92 +15,44 @@ 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity); 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponCosumeEntity); + paramMap.put("petCategoryId",StringUtil.toString(couponCosumeEntity.getPetCategoryId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetCategoryId())); + paramMap.put("petBodySizeId",StringUtil.toString(couponCosumeEntity.getPetBodySizeId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetBodySizeId())); 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponFetchEntity); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); + paramMap.put("memberId",StringUtil.toString(couponGetAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getMemberId())); + paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); + paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage())); + paramMap.put("rows",StringUtil.toString(couponGetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getRows())); 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetEntity); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(couponV2GetAllEntity); + paramMap.put("memberId",StringUtil.toString(couponV2GetAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getMemberId())); + paramMap.put("activityId",StringUtil.toString(couponV2GetAllEntity.getActivityId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getActivityId())); + paramMap.put("status",StringUtil.toString(couponV2GetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getStatus())); + paramMap.put("rows",StringUtil.toString(couponV2GetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getRows())); + paramMap.put("page",StringUtil.toString(couponV2GetAllEntity.getPage()).equals("0")?null: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/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java index b94851df..a637c564 100644 --- 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 @@ -19,26 +19,17 @@ 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAccountChangeEntity); MapRemoveNullUtil.removeNullEntry(paramMap); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAccountHistoryEntity); + paramMap.put("page",StringUtil.toString(memberAccountHistoryEntity.getPage()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getPage())); + paramMap.put("row",StringUtil.toString(memberAccountHistoryEntity.getRows()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getRows())); + paramMap.put("changeTypeId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId())); + paramMap.put("changeTypeParentId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId())); MapRemoveNullUtil.removeNullEntry(paramMap); 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 index 8f4c32ee..0ba8c7aa 100644 --- 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 @@ -19,52 +19,27 @@ public class MemberAddressService { 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressGetAllEntity); MapRemoveNullUtil.removeNullEntry(paramMap); 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()); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressAddEntity); MapRemoveNullUtil.removeNullEntry(paramMap); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressUpdateEntity); paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.equals("0")?null: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())); MapRemoveNullUtil.removeNullEntry(paramMap); 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())); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddressDeleteEntity); MapRemoveNullUtil.removeNullEntry(paramMap); 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/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 6bd51ea3..79f8c7d8 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 @@ -10,10 +10,7 @@ import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.business.log.LogService; import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; import net.lab1024.smartadmin.module.system.login.LoginTokenService; -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.member.MemberUpdateMemberLevelEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.*; import net.lab1024.smartadmin.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; import net.lab1024.smartadmin.util.SmartIPUtil; @@ -49,74 +46,61 @@ public class MemberService { private String jwtKey; public String memberGet(MemberGetEntity memberGetEntity, HttpServletRequest request)throws Exception { - Map paramMap = new HashMap<>(); - paramMap.put("channelId", StringUtil.toString(memberGetEntity.getChannelId())); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity); paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId())); - paramMap.put("mobile",memberGetEntity.getMobile()); - paramMap.put("unionId",memberGetEntity.getUnionId()); MapRemoveNullUtil.removeNullEntry(paramMap); String sb = SmartHttpUtil.sendPostForm(url+"get",paramMap,null); JSONObject jsonObject = JSONObject.parseObject(sb); - 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(); + if(!jsonObject.getString("code").equals("-1")){ + 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; + } } public String memberCheck(MemberCheckEntity memberCheckEntity)throws Exception { - Map paramMap = new HashMap<>(); - paramMap.put("channelId", StringUtil.toString(memberCheckEntity.getChannelId())); - paramMap.put("mobile",memberCheckEntity.getMobile()); - paramMap.put("unionId",memberCheckEntity.getUnionId()); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberCheckEntity); MapRemoveNullUtil.removeNullEntry(paramMap); return SmartHttpUtil.sendPostForm(url+"check",paramMap,null); } public String memberAdd(MemberAddEntity memberAddEntity)throws Exception { - Map paramMap = new HashMap<>(); - paramMap.put("channelId", StringUtil.toString(memberAddEntity.getChannelId())); - paramMap.put("memberName",memberAddEntity.getMemberName()); - paramMap.put("realName",memberAddEntity.getRealName()); - paramMap.put("mobile",memberAddEntity.getMobile()); - paramMap.put("gender",StringUtil.toString(memberAddEntity.getGender())); - paramMap.put("email",memberAddEntity.getEmail()); - paramMap.put("openId",memberAddEntity.getOpenId()); - paramMap.put("unionId",memberAddEntity.getUnionId()); - paramMap.put("birthday",memberAddEntity.getBirthday()); - paramMap.put("provinceId",StringUtil.toString(memberAddEntity.getProvinceId())); - paramMap.put("cityId",StringUtil.toString(memberAddEntity.getCityId())); - paramMap.put("districtId",memberAddEntity.getDistrictId()); - paramMap.put("address",memberAddEntity.getAddress()); - paramMap.put("storeCode",memberAddEntity.getStoreCode()); - paramMap.put("remark",memberAddEntity.getRemark()); - paramMap.put("memberMark",memberAddEntity.getMemberMark()); - paramMap.put("isFollowWechat",StringUtil.toString(memberAddEntity.isFollowWechat())); - paramMap.put("isAddCommunityAssistantwechat",StringUtil.toString(memberAddEntity.isAddCommunityAssistantwechat())); - paramMap.put("isJoinScrmCommunity",StringUtil.toString((memberAddEntity.isJoinScrmCommunity()))); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberAddEntity); + paramMap.put("cityId",StringUtil.toString(memberAddEntity.getCityId()).equals("0")?null:StringUtil.toString(memberAddEntity.getCityId())); + paramMap.put("districtId",memberAddEntity.getDistrictId().equals("0")?null:memberAddEntity.getDistrictId()); MapRemoveNullUtil.removeNullEntry(paramMap); return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); } public String memberUpdateMemberLevel(MemberUpdateMemberLevelEntity memberUpdateMemberLevelEntity)throws Exception { - Map paramMap = new HashMap<>(); - paramMap.put("channelId", StringUtil.toString(memberUpdateMemberLevelEntity.getChannelId())); - paramMap.put("channelSecurity",memberUpdateMemberLevelEntity.getChannelSecurity()); + Map paramMap = MapRemoveNullUtil.setConditionMap(memberUpdateMemberLevelEntity); paramMap.put("id",StringUtil.toString(memberUpdateMemberLevelEntity.getId()).equals("0")?null:StringUtil.toString(memberUpdateMemberLevelEntity.getId())); - paramMap.put("memberLevel",StringUtil.toString(memberUpdateMemberLevelEntity.getMemberLevel())); MapRemoveNullUtil.removeNullEntry(paramMap); return SmartHttpUtil.sendPostForm(url+"check",paramMap,null); } + public String memberUpdate(MemberUpdateEntity memberUpdateEntity)throws Exception{ + Map paramMap = MapRemoveNullUtil.setConditionMap(memberUpdateEntity); + paramMap.put("id",StringUtil.toString(memberUpdateEntity.getId()).equals("0")?null:StringUtil.toString(memberUpdateEntity.getId())); + paramMap.put("cityId",StringUtil.toString(memberUpdateEntity.getCityId()).equals("0")?null:StringUtil.toString(memberUpdateEntity.getCityId())); + paramMap.put("districtId",StringUtil.toString(memberUpdateEntity.getDistrictId()).equals("0")?null:StringUtil.toString(memberUpdateEntity.getDistrictId())); + MapRemoveNullUtil.removeNullEntry(paramMap); + return SmartHttpUtil.sendPostForm(url+"update",paramMap,null); + } + /** * 功能描述: 生成JWT TOKEN @@ -137,15 +121,6 @@ public class MemberService { Claims jwtClaims = Jwts.claims().setSubject(baseToken); jwtClaims.put(CLAIM_ID_KEY, id); String compactJws = Jwts.builder().setClaims(jwtClaims).setNotBefore(from).setExpiration(expire).signWith(SignatureAlgorithm.HS512, jwtKey).compact(); - -// EmployeeBO employeeBO = employeeService.getById(id); -// RequestTokenBO tokenBO = new RequestTokenBO(employeeBO); - return compactJws; } - - public void useLog(HttpServletRequest request){ - //登陆操作日志 - - } } 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 1a04b78f..c7222245 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 @@ -8,14 +8,12 @@ import net.lab1024.smartadmin.common.anno.OperateLog; import net.lab1024.smartadmin.common.domain.ResponseDTO; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.constant.SwaggerTagConst; +import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; 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.domain.RoyalcaninOperateLogEntity; import net.lab1024.smartadmin.module.system.royalcanin.domain.RoyalcaninOperateLogService; -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.member.MemberUpdateMemberLevelEntity; +import net.lab1024.smartadmin.module.system.royalcanin.member.*; 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; @@ -51,6 +49,9 @@ public class TransitionController { @Autowired private CouponConfigService couponConfigService; + @Autowired + private CouponService couponService; + @ApiOperation(value = "会员信息", notes = "会员查询，验证会员信息，会员注册") @PostMapping("royalcanin/member") public String transferMember(String type , @RequestBody Object object, HttpServletRequest request) throws Exception { @@ -71,6 +72,10 @@ public class TransitionController { case "updateMemberLevel": result = memberService.memberUpdateMemberLevel(objectMapper.convertValue(object, MemberUpdateMemberLevelEntity.class)); break; + case "update": + result = memberService.memberUpdate(objectMapper.convertValue(object, MemberUpdateEntity.class)); + break; + } long acceptTime = System.currentTimeMillis() ; long elapsedTime = acceptTime - startTime; @@ -138,10 +143,46 @@ public class TransitionController { long startTime = System.currentTimeMillis(); switch (type) { - case "change": - return couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); - case "history": - return couponConfigService.couponConfigGet(objectMapper.convertValue(object, CouponConfigGetEntity.class)); + case "findAll": + result = couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); + break; + case "get": + result = couponConfigService.couponConfigGet(objectMapper.convertValue(object, CouponConfigGetEntity.class)); + break; + } + long acceptTime = System.currentTimeMillis() ; + long elapsedTime = acceptTime - startTime; + //记录服务响应时间 + addOperatreFullData(type,object.toString(),result, startTime,elapsedTime,acceptTime,request); + return result; + } + + @ApiOperation(value = "优惠券种类", notes = "查询所有优惠券种类,查询单条优惠券种类") + @PostMapping("royalcanin/couponConfig") + public String transferCoupon(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + String result = "null"; + long startTime = System.currentTimeMillis(); + switch (type) + { + case "getAll": + result = couponService.couponGetAll(objectMapper.convertValue(object, CouponGetAllEntity.class)); + break; + case "consume": + result = couponService.couponCosume(objectMapper.convertValue(object, CouponCosumeEntity.class)); + break; + case "fetch": + result = couponService.couponFetch(objectMapper.convertValue(object, CouponFetchEntity.class)); + break; + case "get": + result = couponService.couponGet(objectMapper.convertValue(object, CouponGetEntity.class)); + break; + case "cancel": + result = couponService.couponCancel(objectMapper.convertValue(object, CouponCancelEntity.class)); + break; + case "v2/getAll": + result = couponService.couponV2GetAll(objectMapper.convertValue(object, CouponV2GetAllEntity.class)); + break; } long acceptTime = System.currentTimeMillis() ; long elapsedTime = acceptTime - startTime; 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 new file mode 100644 index 00000000..6ab2c6eb --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java @@ -0,0 +1,46 @@ +package net.lab1024.smartadmin.module.system.royalcanin.member; + +import lombok.Data; + +@Data +public class MemberUpdateEntity { + + private int channelId; + + private int id ; + + private String memberName; + + private String realName; + + private String mobile; + + private String gender; + + private String email; + + private String openId; + + private String unionId; + + private String birthday; + + private String provinceId; + + private int cityId; + + private int districtId; + + private String address; + + private String storeCode; + + private String memberMark; + + private Boolean isFollowWechat; + + private Boolean isJoinScrmCommunity; + + private String remark; + +} diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/MapRemoveNullUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/MapRemoveNullUtil.java index b9cdd7f1..fcca1952 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/MapRemoveNullUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/MapRemoveNullUtil.java @@ -1,5 +1,7 @@ package net.lab1024.smartadmin.util; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.*; public class MapRemoveNullUtil { @@ -99,4 +101,42 @@ public class MapRemoveNullUtil { removeNullEntry(map); System.out.println(map); } + + /** + * 将一个类查询方式加入map（属性值为int型时，0时不加入， + * 属性值为String型或Long时为null和“”不加入） + *注：需要转换的必须是对象，即有属性 + */ + public static Map setConditionMap(Object obj){ + Map map = new HashMap<>(); + if(obj==null){ + return null; + } + Field[] fields = obj.getClass().getDeclaredFields();//获取类的各个属性值 + for(Field field : fields){ + String fieldName = field.getName();//获取类的属性名称 + if(getValueByFieldName(fieldName,obj)!=null)//获取类的属性名称对应的值 + { + map.put(fieldName, getValueByFieldName(fieldName,obj)); + } + } + return map; + } + /** + * 根据属性名获取该类此属性的值 + * @param fieldName + * @param object + * @return + */ + private static String getValueByFieldName(String fieldName, Object object){ + String firstLetter=fieldName.substring(0,1).toUpperCase(); + String getter = "get"+firstLetter+fieldName.substring(1); + try { + Method method = object.getClass().getMethod(getter, new Class[]{}); + Object value = method.invoke(object, new Object[] {}); + return value.toString(); + } catch (Exception e) { + return null; + } + } }