xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 18:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding coupon script

Browse Source
This commit is contained in:
Carl 2021-12-09 16:34:02 +08:00
parent 8cae7abece
commit 4f08e07892
8 changed files with 204 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
View File

@ -16,22 +16,17 @@ public class CouponConfigService {
private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/";
public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);
paramMap.put("channelId", StringUtil.toString(couponConfigGetEntity.getChannelId()));
paramMap.put("channelSecurity", couponConfigGetEntity.getChannelSecurity());
paramMap.put("couponId", StringUtil.toString(couponConfigGetEntity.getCouponId()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"get",paramMap,null); return SmartHttpUtil.sendPostForm(url+"get",paramMap,null);
} }
public String couponConfigFindAll(CouponConfigFindAllEntity couponConfigFindAllEntity) throws Exception{ public String couponConfigFindAll(CouponConfigFindAllEntity couponConfigFindAllEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigFindAllEntity);
paramMap.put("channelId", StringUtil.toString(couponConfigFindAllEntity.getChannelId())); paramMap.put("memberTagId",StringUtil.toString(couponConfigFindAllEntity.getMemberTagId()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getMemberTagId()));
paramMap.put("channelSecurity", couponConfigFindAllEntity.getChannelSecurity()); paramMap.put("memberId",StringUtil.toString(couponConfigFindAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getMemberId()));
paramMap.put("memberTagId", StringUtil.toString(couponConfigFindAllEntity.getMemberTagId())); paramMap.put("rows",StringUtil.toString(couponConfigFindAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getRows()));
paramMap.put("memberId", StringUtil.toString(couponConfigFindAllEntity.getMemberId())); paramMap.put("page",StringUtil.toString(couponConfigFindAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getPage()));
paramMap.put("rows", StringUtil.toString(couponConfigFindAllEntity.getRows()));
paramMap.put("page", StringUtil.toString(couponConfigFindAllEntity.getPage()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"findAll",paramMap,null); return SmartHttpUtil.sendPostForm(url+"findAll",paramMap,null);
} }

83
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
View File

@ -2,6 +2,7 @@ package net.lab1024.smartadmin.module.system.royalcanin;
import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.common.heartbeat.StringUtil;
import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; import net.lab1024.smartadmin.module.system.royalcanin.coupon.*;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil; import net.lab1024.smartadmin.util.SmartHttpUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -14,92 +15,44 @@ public class CouponService {
private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/";
public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{ public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity);
paramMap.put("channelId", StringUtil.toString(couponCancelEntity.getChannelId()));
paramMap.put("channelSecurity", couponCancelEntity.getChannelSecurity());
paramMap.put("couponCode", couponCancelEntity.getCouponCode());
return SmartHttpUtil.sendPostForm(url+"cancel",paramMap,null); return SmartHttpUtil.sendPostForm(url+"cancel",paramMap,null);
} }
public String couponCosume(CouponCosumeEntity couponCosumeEntity) throws Exception{ public String couponCosume(CouponCosumeEntity couponCosumeEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponCosumeEntity);
paramMap.put("channelId", StringUtil.toString(couponCosumeEntity.getChannelId())); paramMap.put("petCategoryId",StringUtil.toString(couponCosumeEntity.getPetCategoryId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetCategoryId()));
paramMap.put("channelSecurity", couponCosumeEntity.getChannelSecurity()); paramMap.put("petBodySizeId",StringUtil.toString(couponCosumeEntity.getPetBodySizeId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetBodySizeId()));
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); return SmartHttpUtil.sendPostForm(url+"consume",paramMap,null);
} }
public String couponFetch(CouponFetchEntity couponFetchEntity) throws Exception{ public String couponFetch(CouponFetchEntity couponFetchEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponFetchEntity);
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); return SmartHttpUtil.sendPostForm(url+"fetch",paramMap,null);
} }
public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity);
paramMap.put("channelId", StringUtil.toString(couponGetAllEntity.getChannelId())); paramMap.put("memberId",StringUtil.toString(couponGetAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getMemberId()));
paramMap.put("channelSecurity", couponGetAllEntity.getChannelSecurity()); paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus()));
paramMap.put("memberId", StringUtil.toString(couponGetAllEntity.getMemberId())); paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage()));
paramMap.put("mobile", couponGetAllEntity.getMobile()); paramMap.put("rows",StringUtil.toString(couponGetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getRows()));
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); return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null);
} }
public String couponGet(CouponGetEntity couponGetEntity) throws Exception{ public String couponGet(CouponGetEntity couponGetEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetEntity);
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); return SmartHttpUtil.sendPostForm(url+"get",paramMap,null);
} }
public String couponV2GetAll(CouponV2GetAllEntity couponV2GetAllEntity) throws Exception{ public String couponV2GetAll(CouponV2GetAllEntity couponV2GetAllEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponV2GetAllEntity);
paramMap.put("channelId", StringUtil.toString(couponV2GetAllEntity.getChannelId())); paramMap.put("memberId",StringUtil.toString(couponV2GetAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getMemberId()));
paramMap.put("channelSecurity", couponV2GetAllEntity.getChannelSecurity()); paramMap.put("activityId",StringUtil.toString(couponV2GetAllEntity.getActivityId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getActivityId()));
paramMap.put("memberId", StringUtil.toString(couponV2GetAllEntity.getMemberId())); paramMap.put("status",StringUtil.toString(couponV2GetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getStatus()));
paramMap.put("mobile", couponV2GetAllEntity.getMobile()); paramMap.put("rows",StringUtil.toString(couponV2GetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getRows()));
paramMap.put("couponId", couponV2GetAllEntity.getCouponId()); paramMap.put("page",StringUtil.toString(couponV2GetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getPage()));
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); return SmartHttpUtil.sendPostForm(url+"v2/getAll",paramMap,null);
} }
} }

21
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java
View File

@ -19,26 +19,17 @@ public class MemberAccountService {
private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/"; private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/";
public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity) throws Exception{ public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAccountChangeEntity);
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());
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"change",paramMap,null); return SmartHttpUtil.sendPostForm(url+"change",paramMap,null);
} }
public String memberAccountHistory(MemberAccountHistoryEntity memberAccountHistoryEntity) throws Exception{ public String memberAccountHistory(MemberAccountHistoryEntity memberAccountHistoryEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAccountHistoryEntity);
paramMap.put("channelId", StringUtil.toString(memberAccountHistoryEntity.getChannelId())); paramMap.put("page",StringUtil.toString(memberAccountHistoryEntity.getPage()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getPage()));
paramMap.put("memberId",StringUtil.toString(memberAccountHistoryEntity.getChannelId())); paramMap.put("row",StringUtil.toString(memberAccountHistoryEntity.getRows()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getRows()));
paramMap.put("changeTypeId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId())); paramMap.put("changeTypeId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getChangeTypeId()));
paramMap.put("changeTypeParentId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId())); paramMap.put("changeTypeParentId",StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId()).equals("0")?null:StringUtil.toString(memberAccountHistoryEntity.getChangeTypeParentId()));
paramMap.put("rows",StringUtil.toString(memberAccountHistoryEntity.getRows()));
paramMap.put("page",StringUtil.toString(memberAccountHistoryEntity.getPage()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"history",paramMap,null); return SmartHttpUtil.sendPostForm(url+"history",paramMap,null);
} }

33
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java
View File

@ -19,52 +19,27 @@ public class MemberAddressService {
public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception { public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception {
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddressGetAllEntity);
paramMap.put("channelId", StringUtil.toString(memberAddressGetAllEntity.getChannelId()));
paramMap.put("memberId",StringUtil.toString(memberAddressGetAllEntity.getMemberId()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); return SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null);
} }
public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) throws Exception{ public String memberAddressAdd(MemberAddressAddEntity memberAddressAddEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddressAddEntity);
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());
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); return SmartHttpUtil.sendPostForm(url+"add",paramMap,null);
} }
public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity) throws Exception{ public String memberAddressUpdate(MemberAddressUpdateEntity memberAddressUpdateEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddressUpdateEntity);
paramMap.put("channelId",StringUtil.toString(memberAddressUpdateEntity.getChannelId()));
paramMap.put("memberId",StringUtil.toString(memberAddressUpdateEntity.getMemberId()));
paramMap.put("id",StringUtil.toString(memberAddressUpdateEntity.equals("0")?null:StringUtil.toString(memberAddressUpdateEntity.getId()))); 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); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); return SmartHttpUtil.sendPostForm(url+"add",paramMap,null);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String memberAddressDelete(MemberAddressDeleteEntity memberAddressDeleteEntity) throws Exception{ public String memberAddressDelete(MemberAddressDeleteEntity memberAddressDeleteEntity) throws Exception{
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddressDeleteEntity);
paramMap.put("channelId", StringUtil.toString(memberAddressDeleteEntity.getChannelId()));
paramMap.put("memberId",StringUtil.toString(memberAddressDeleteEntity.getMemberId()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"delete",paramMap,null); return SmartHttpUtil.sendPostForm(url+"delete",paramMap,null);
} }

95
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
View File

@ -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.LogService;
import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity; import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity;
import net.lab1024.smartadmin.module.system.login.LoginTokenService; 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.*;
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.util.MapRemoveNullUtil; import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil; import net.lab1024.smartadmin.util.SmartHttpUtil;
import net.lab1024.smartadmin.util.SmartIPUtil; import net.lab1024.smartadmin.util.SmartIPUtil;
@ -49,74 +46,61 @@ public class MemberService {
private String jwtKey; private String jwtKey;
public String memberGet(MemberGetEntity memberGetEntity, HttpServletRequest request)throws Exception { public String memberGet(MemberGetEntity memberGetEntity, HttpServletRequest request)throws Exception {
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity);
paramMap.put("channelId", StringUtil.toString(memberGetEntity.getChannelId()));
paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId())); 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); MapRemoveNullUtil.removeNullEntry(paramMap);
String sb = SmartHttpUtil.sendPostForm(url+"get",paramMap,null); String sb = SmartHttpUtil.sendPostForm(url+"get",paramMap,null);
JSONObject jsonObject = JSONObject.parseObject(sb); JSONObject jsonObject = JSONObject.parseObject(sb);
JSONObject json = JSONObject.parseObject(jsonObject.getString("data")); if(!jsonObject.getString("code").equals("-1")){
String id = json.getString("id"); JSONObject json = JSONObject.parseObject(jsonObject.getString("data"));
jsonObject.put("xaccessToken",generateToken(id)); String id = json.getString("id");
UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent")); jsonObject.put("xaccessToken",generateToken(id));
UserLoginLogEntity logEntity = UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
UserLoginLogEntity.builder() UserLoginLogEntity logEntity =
.userId(Long.parseLong(id)) UserLoginLogEntity.builder()
.userName(json.getString("memberName")) .userId(Long.parseLong(id))
.remoteIp(SmartIPUtil.getRemoteIp(request)) .userName(json.getString("memberName"))
.remotePort(request.getRemotePort()) .remoteIp(SmartIPUtil.getRemoteIp(request))
.remoteBrowser(userAgent.getBrowser().getName()) .remotePort(request.getRemotePort())
.remoteOs(userAgent.getOperatingSystem().getName()) .remoteBrowser(userAgent.getBrowser().getName())
.loginStatus(JudgeEnum.YES.getValue()).build(); .remoteOs(userAgent.getOperatingSystem().getName())
logService.addLog(logEntity); .loginStatus(JudgeEnum.YES.getValue()).build();
return jsonObject.toJSONString(); logService.addLog(logEntity);
return jsonObject.toJSONString();
}else {
return sb;
}
} }
public String memberCheck(MemberCheckEntity memberCheckEntity)throws Exception { public String memberCheck(MemberCheckEntity memberCheckEntity)throws Exception {
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberCheckEntity);
paramMap.put("channelId", StringUtil.toString(memberCheckEntity.getChannelId()));
paramMap.put("mobile",memberCheckEntity.getMobile());
paramMap.put("unionId",memberCheckEntity.getUnionId());
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"check",paramMap,null); return SmartHttpUtil.sendPostForm(url+"check",paramMap,null);
} }
public String memberAdd(MemberAddEntity memberAddEntity)throws Exception { public String memberAdd(MemberAddEntity memberAddEntity)throws Exception {
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddEntity);
paramMap.put("channelId", StringUtil.toString(memberAddEntity.getChannelId())); paramMap.put("cityId",StringUtil.toString(memberAddEntity.getCityId()).equals("0")?null:StringUtil.toString(memberAddEntity.getCityId()));
paramMap.put("memberName",memberAddEntity.getMemberName()); paramMap.put("districtId",memberAddEntity.getDistrictId().equals("0")?null:memberAddEntity.getDistrictId());
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())));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"add",paramMap,null); return SmartHttpUtil.sendPostForm(url+"add",paramMap,null);
} }
public String memberUpdateMemberLevel(MemberUpdateMemberLevelEntity memberUpdateMemberLevelEntity)throws Exception { public String memberUpdateMemberLevel(MemberUpdateMemberLevelEntity memberUpdateMemberLevelEntity)throws Exception {
Map<String, String> paramMap = new HashMap<>(); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberUpdateMemberLevelEntity);
paramMap.put("channelId", StringUtil.toString(memberUpdateMemberLevelEntity.getChannelId()));
paramMap.put("channelSecurity",memberUpdateMemberLevelEntity.getChannelSecurity());
paramMap.put("id",StringUtil.toString(memberUpdateMemberLevelEntity.getId()).equals("0")?null:StringUtil.toString(memberUpdateMemberLevelEntity.getId())); paramMap.put("id",StringUtil.toString(memberUpdateMemberLevelEntity.getId()).equals("0")?null:StringUtil.toString(memberUpdateMemberLevelEntity.getId()));
paramMap.put("memberLevel",StringUtil.toString(memberUpdateMemberLevelEntity.getMemberLevel()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
return SmartHttpUtil.sendPostForm(url+"check",paramMap,null); return SmartHttpUtil.sendPostForm(url+"check",paramMap,null);
} }
public String memberUpdate(MemberUpdateEntity memberUpdateEntity)throws Exception{
Map<String, String> 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 * 功能描述: 生成JWT TOKEN
@ -137,15 +121,6 @@ public class MemberService {
Claims jwtClaims = Jwts.claims().setSubject(baseToken); Claims jwtClaims = Jwts.claims().setSubject(baseToken);
jwtClaims.put(CLAIM_ID_KEY, id); jwtClaims.put(CLAIM_ID_KEY, id);
String compactJws = Jwts.builder().setClaims(jwtClaims).setNotBefore(from).setExpiration(expire).signWith(SignatureAlgorithm.HS512, jwtKey).compact(); 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; return compactJws;
} }
public void useLog(HttpServletRequest request){
//登陆操作日志
}
} }

57
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
View File

@ -8,14 +8,12 @@ import net.lab1024.smartadmin.common.anno.OperateLog;
import net.lab1024.smartadmin.common.domain.ResponseDTO; import net.lab1024.smartadmin.common.domain.ResponseDTO;
import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.common.heartbeat.StringUtil;
import net.lab1024.smartadmin.constant.SwaggerTagConst; 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.CouponConfigFindAllEntity;
import net.lab1024.smartadmin.module.system.royalcanin.couponConfig.CouponConfigGetEntity; 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.RoyalcaninOperateLogEntity;
import net.lab1024.smartadmin.module.system.royalcanin.domain.RoyalcaninOperateLogService; 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.*;
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.memberAccount.MemberAccountChangeEntity; 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.memberAccount.MemberAccountHistoryEntity;
import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressAddEntity; import net.lab1024.smartadmin.module.system.royalcanin.memberAddress.MemberAddressAddEntity;
@ -51,6 +49,9 @@ public class TransitionController {
@Autowired @Autowired
private CouponConfigService couponConfigService; private CouponConfigService couponConfigService;
@Autowired
private CouponService couponService;
@ApiOperation(value = "会员信息", notes = "会员查询，验证会员信息，会员注册") @ApiOperation(value = "会员信息", notes = "会员查询，验证会员信息，会员注册")
@PostMapping("royalcanin/member") @PostMapping("royalcanin/member")
public String transferMember(String type , @RequestBody Object object, HttpServletRequest request) throws Exception { public String transferMember(String type , @RequestBody Object object, HttpServletRequest request) throws Exception {
@ -71,6 +72,10 @@ public class TransitionController {
case "updateMemberLevel": case "updateMemberLevel":
result = memberService.memberUpdateMemberLevel(objectMapper.convertValue(object, MemberUpdateMemberLevelEntity.class)); result = memberService.memberUpdateMemberLevel(objectMapper.convertValue(object, MemberUpdateMemberLevelEntity.class));
break; break;
case "update":
result = memberService.memberUpdate(objectMapper.convertValue(object, MemberUpdateEntity.class));
break;
} }
long acceptTime = System.currentTimeMillis() ; long acceptTime = System.currentTimeMillis() ;
long elapsedTime = acceptTime - startTime; long elapsedTime = acceptTime - startTime;
@ -138,10 +143,46 @@ public class TransitionController {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
switch (type) switch (type)
{ {
case "change": case "findAll":
return couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); result = couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class));
case "history": break;
return couponConfigService.couponConfigGet(objectMapper.convertValue(object, CouponConfigGetEntity.class)); 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 acceptTime = System.currentTimeMillis() ;
long elapsedTime = acceptTime - startTime; long elapsedTime = acceptTime - startTime;

46
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/member/MemberUpdateEntity.java Normal file
View File

@ -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;
}

40
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/MapRemoveNullUtil.java
View File

@ -1,5 +1,7 @@
package net.lab1024.smartadmin.util; package net.lab1024.smartadmin.util;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.*; import java.util.*;
public class MapRemoveNullUtil { public class MapRemoveNullUtil {
@ -99,4 +101,42 @@ public class MapRemoveNullUtil {
removeNullEntry(map); removeNullEntry(map);
System.out.println(map); System.out.println(map);
} }
/**
* 将一个类查询方式加入map（属性值为int型时，0时不加入，
* 属性值为String型或Long时为null和“”不加入）
*注：需要转换的必须是对象，即有属性
*/
public static Map<String, String> setConditionMap(Object obj){
Map<String, String> 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;
}
}
} }