diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/CaChe.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/CaChe.java deleted file mode 100644 index 55fa658..0000000 --- a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/CaChe.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.muyu.cache; - -/** - * 缓存接口基类 CaChe - * - * @author LeYang - * on 2024/3/27 - */ -public interface CaChe { - /** - * key前缀 - * @return key前缀 - */ - public String keyPre(); - - /** - * 编码 - * @param key - * @return 键 - */ - public String encode(K key); - - /** - * 解码 - * @param redisKey 数据库键 - * @return ID - */ - public K decode(String redisKey); - - /** - * 通过key获取value值 - * @param key 键 - * @return 值 - */ - public V get(K key); - - /** - * 缓存添加/修改 - * @param key 键 - * @param value 值 - */ - public void put(K key,V value); - - /** - * 通过键删除 - * @param key 键 - */ - public void remove(K key); - - /** - * 刷新缓存时间 - * @param key 键 - */ - public void refreshTime(K key); - - /** - * 刷新缓存数据 - * @param key 键 - */ - public void refreshDate(K key); -} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/AtomicSequenceCache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/AtomicSequenceCache.java new file mode 100644 index 0000000..f3ec127 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/AtomicSequenceCache.java @@ -0,0 +1,37 @@ +package com.muyu.common.cache; + +import com.muyu.common.cache.decoration.DecorationKey; + +/** + * @author yangle + * @description: 原子序列缓存基准 + * @Date 2024-4-1 下午 08:07 + */ +public interface AtomicSequenceCache extends DecorationKey { + + /** + * 获取存储的值 + * @param key 键 + * @return 值 + */ + public Long get(K key); + + /** + * 自增 + */ + public Long increment(K key); + /** + * 自减 + */ + public Long decrement(K key); + + /** + * 增加数值 + */ + public Long increment(K key, Long number); + + /** + * 减少数值 + */ + public Long decrement(K key, Long number); +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java new file mode 100644 index 0000000..a3eea45 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java @@ -0,0 +1,43 @@ +package com.muyu.common.cache; + +import com.muyu.common.cache.decoration.DecorationKey; + +/** + * @author yangle + * @description: 缓存接口基类 + * @Date 2024-3-26 下午 03:25 + */ +public interface Cache extends DecorationKey { + + /** + * 通过Key获取value值 + * @param key 键 + * @return 值 + */ + public V get(K key); + + /** + * 缓存添加/修改 + * @param key 键 + * @param value 值 + */ + public void put(K key, V value); + + /** + * 通过键删除 + * @param key 键 + */ + public void remove(K key); + + /** + * 刷新缓存时间 + * @param key 键 + */ + public void refreshTime (K key); + + /** + * 刷新缓存数据 + * @param key 键 + */ + public void refreshData (K key); +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/GetData.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/GetData.java new file mode 100644 index 0000000..17816bf --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/GetData.java @@ -0,0 +1,21 @@ +package com.muyu.common.cache; + +/** + * GetData + * + * @author LeYang + * on 2024/3/29 + */ +public interface GetData { + /** + * 从数据库获取数据 + * @param key ID + * @return 缓存对象 + */ + public abstract V getData(K key); + + /** + * 默认值 + */ + public abstract V defaultValue(); +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/HashCache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/HashCache.java new file mode 100644 index 0000000..36ca988 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/HashCache.java @@ -0,0 +1,97 @@ +package com.muyu.common.cache; + +import com.muyu.common.cache.decoration.DecorationKey; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * @author yangle + * @description: Hash缓存基准 + * @Date 2024-3-29 下午 03:16 + */ +public interface HashCache extends DecorationKey { + + + /** + * 编码 + * @param hashKey ID + * @return 键 + */ + public String encodeHashKey(HK hashKey); + + /** + * 解码 + * @param redisHashKey 数据库键 + * @return ID + */ + public HK decodeHashKey(String redisHashKey); + + /** + * 通过Key获取所有的map + * @param key 数据库键 + * @return 所有集合Map + */ + public Map get(K key); + + /** + * 通过键和hashKey获取数据库hashValue + * @param key 键 + * @param hashKey hash键 + * @return hash值 + */ + public HV get(K key, HK hashKey); + + /** + * 通过键和hashKey获取数据库hashValue + * @param key 键 + * @param hashKeyList hash键集合 + * @return hash值 + */ + public List get(K key, HK... hashKeyList); + + /** + * 获取hash值集合 + * @param key 键 + * @return hash值集合 + */ + public List getToList(K key); + + /** + * 存储数据 + * @param key redis键 + * @param map hashMap集合 + */ + public void put(K key, Map map); + + /** + * 存储数据 + * @param key redis键 + * @param dataList 数据值 + * @param hashKey hash键 + */ + public void put(K key, List dataList, Function hashKey); + + /** + * 存储数据 + * @param key redis键 + * @param hashKey hash键 + * @param hashValue hash值 + */ + public void put(K key, HK hashKey, HV hashValue); + + /** + * 通过redis键删除 + * @param key hash键 + */ + public void remove(K key); + + /** + * 通过redis键和hash键删除 + * @param key redis键 + * @param hashKey hash键 + */ + public void remove(K key, HK hashKey); + +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/AtomicSequenceCacheAbs.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/AtomicSequenceCacheAbs.java new file mode 100644 index 0000000..de7e9fa --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/AtomicSequenceCacheAbs.java @@ -0,0 +1,93 @@ +package com.muyu.common.cache.abs; + +import com.muyu.common.cache.AtomicSequenceCache; +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @author yangle + * @description: 原子序列缓存抽象类 + * @Date 2024-4-1 下午 08:33 + */ +public abstract class AtomicSequenceCacheAbs implements AtomicSequenceCache { + + @Autowired + private RedisService redisService; + + /** + * 获取存储的值 + * @param key 键 + * @return 值 + */ + @Override + public Long get (K key) { + return this.redisService.getCacheObject(encode(key)); + } + + /** + * 自增 + * @param key + */ + @Override + public Long increment (K key) { + return this.increment(key, 1L); + } + + /** + * 自减 + * + * @param key + */ + @Override + public Long decrement (K key) { + return this.decrement(key, 1L); + } + + /** + * 增加数值 + * + * @param key + * @param number + */ + @Override + public Long increment (K key, Long number) { + Long numberValue = redisService.getCacheObject(encode(key)); + if (numberValue == null){ + Long data = getData(key); + data = data == null ? 0L : data; + redisService.setCacheObject(encode(key), data); + } + return redisService.increment(encode(key), number); + } + + /** + * 减少数值 + * + * @param key + * @param number + */ + @Override + public Long decrement (K key, Long number) { + Long numberValue = redisService.getCacheObject(encode(key)); + if (numberValue == null){ + Long data = getData(key); + data = data == null ? 0L : data; + redisService.setCacheObject(encode(key), data); + } + return redisService.decrement(encode(key), number); + } + + /** + * 编码 + * + * @param key ID + * + * @return 键 + */ + @Override + public String encode (K key) { + return keyPre() + key; + } + + public abstract Long getData(K key); +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java similarity index 52% rename from muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java rename to muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java index 8f30909..1b07c6e 100644 --- a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java @@ -1,59 +1,57 @@ -package com.muyu.cache.abs; +package com.muyu.common.cache.abs; -import com.muyu.cache.CaChe; +import com.muyu.common.cache.Cache; import com.muyu.common.redis.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; import java.util.concurrent.TimeUnit; /** - * 缓存抽象类 CacheAbs - * - * @author LeYang - * on 2024/3/27 + * @author yangle + * @description: 缓存抽象类 + * @Date 2024-3-27 下午 03:10 */ -public abstract class CacheAbs implements CaChe { +public abstract class CacheAbs implements Cache { + @Autowired private RedisService redisService; - /** * 编码 - * @param key Id - * @return 值 + * @param key ID + * @return 键 */ @Override - public String encode(K key) { - return keyPre()+key; + public String encode (K key) { + return keyPre() + key; } - /** - * 通过key获取value 值 + * 通过Key获取value值 * @param key 键 - * @return + * @return 值 */ @Override - public V get(K key) { - V value= redisService.getCacheObject(encode(key)); + public V get (K key) { + V value = redisService.getCacheObject(encode(key)); if (value == null){ value = getData(key); - if (value == null ){ + if (value == null){ value = defaultValue(); } } - this.put(key,value); + this.put(key, value); return value; } /** * 缓存添加/修改 - * @param key 键 + * @param key 键 * @param value 值 */ @Override - public void put(K key, V value) { - this.redisService.setCacheObject(encode(key), value); + public void put (K key, V value) { + this.redisService.setCacheObject(encode(key), value); } /** @@ -61,8 +59,8 @@ public abstract class CacheAbs implements CaChe { * @param key 键 */ @Override - public void remove(K key) { - this.redisService.deleteObject(encode(key)); + public void remove (K key) { + this.redisService.deleteObject(encode(key)); } /** @@ -70,17 +68,18 @@ public abstract class CacheAbs implements CaChe { * @param key 键 */ @Override - public void refreshTime(K key) { - this.redisService.expire(encode(key), 60, TimeUnit.SECONDS); + public void refreshTime (K key) { + this.redisService.expire(encode(key), 60, TimeUnit.SECONDS); } /** * 刷新缓存数据 + * * @param key 键 */ @Override - public void refreshDate(K key) { - this.put(key,getData(key)); + public void refreshData (K key) { + this.put(key, getData(key)); } /** diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/HashCacheAbs.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/HashCacheAbs.java new file mode 100644 index 0000000..309c541 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/HashCacheAbs.java @@ -0,0 +1,212 @@ +package com.muyu.common.cache.abs; + +import com.muyu.common.cache.HashCache; +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * @author yangle + * @description: hash缓存抽象类 + * @Date 2024-3-29 下午 07:40 + */ +public abstract class HashCacheAbs implements HashCache { + + @Autowired + private RedisService redisService; + + /** + * 编码 + * + * @param key ID + * + * @return 键 + */ + @Override + public String encode (K key) { + return keyPre() + key; + } + + /** + * 编码 + * @param hashKey ID + * @return 键 + */ + @Override + public String encodeHashKey (HK hashKey) { + return hashKey.toString(); + } + + /** + * 通过Key获取所有的map + * @param key 数据库键 + * @return 所有集合Map + */ + @Override + public Map get (K key) { + // 获取为null的情况 + Map cacheMap = redisService.getCacheMap(encode(key)); + if (cacheMap == null || cacheMap.isEmpty()){ + Map dataMap = getData(key); + if (dataMap != null && !dataMap.isEmpty()){ + cacheMap = encodeMap(dataMap); + }else { + cacheMap = encodeMap(defaultValue()); + } + redisService.setCacheMap(encode(key), cacheMap); + } + return decodeMap(cacheMap); + } + + /** + * 通过键和hashKey获取数据库hashValue + * + * @param key 键 + * @param hashKey hash键 + * + * @return hash值 + */ + @Override + public HV get (K key, HK hashKey) { + HV hashValue = redisService.getCacheMapValue(encode(key), encodeHashKey(hashKey)); + if (hashValue == null){ + HV dataValue = getData(key, hashKey); + hashValue = dataValue != null ? dataValue : defaultHashValue(); + put(key, hashKey, hashValue); + } + return hashValue; + } + + /** + * 通过键和hashKey获取数据库hashValue + * + * @param key 键 + * @param hashKeyList hash键集合 + * + * @return hash值 + */ + @Override + public List get (K key, HK... hashKeyList) { + List encodeHashKeyList = Arrays.stream(hashKeyList).map(this::encodeHashKey).toList(); + return redisService.getMultiCacheMapValue(encode(key), encodeHashKeyList); + } + + /** + * 获取hash值集合 + * + * @param key 键 + * + * @return hash值集合 + */ + @Override + public List getToList (K key) { + Map hkhvMap = get(key); + return hkhvMap.values().stream().toList(); + } + + /** + * 存储数据 + * + * @param key redis键 + * @param map hashMap集合 + */ + @Override + public void put (K key, Map map) { + redisService.setCacheMap(encode(key), encodeMap(map)); + } + + /** + * 存储数据 + * + * @param key redis键 + * @param dataList 数据值 + * @param hashKey hash键 + */ + @Override + public void put (K key, List dataList, Function hashKey) { + Map dataMap = new HashMap<>(); + dataList.forEach((data) -> dataMap.put(hashKey.apply(data), data)); + redisService.setCacheMap(encode(key), encodeMap(dataMap)); + } + + /** + * 存储数据 + * + * @param key redis键 + * @param hashKey hash键 + * @param hashValue hash值 + */ + @Override + public void put (K key, HK hashKey, HV hashValue) { + redisService.setCacheMapValue(encode(key), encodeHashKey(hashKey), hashValue); + } + + /** + * 通过redis键删除 + * + * @param key hash键 + */ + @Override + public void remove (K key) { + redisService.deleteObject(encode(key)); + } + + /** + * 通过redis键和hash键删除 + * + * @param key redis键 + * @param hashKey hash键 + */ + @Override + public void remove (K key, HK hashKey) { + redisService.deleteCacheMapValue(encode(key), encodeHashKey(hashKey)); + } + + /** + * 原始数据转编码数据 + * @param dataMap 原始数据 + * @return 编码数据 + */ + private Map encodeMap(Map dataMap){ + Map encodeDataMap = new HashMap<>(); + dataMap.forEach((hashKey, HashValue) -> encodeDataMap.put(encodeHashKey(hashKey), HashValue)); + return encodeDataMap; + } + + /** + * 编码数据转原始数据 + * @param encodeDataMap 编码数据 + * @return 原始数据 + */ + private Map decodeMap(Map encodeDataMap){ + Map dataMap = new HashMap<>(); + encodeDataMap.forEach((hashKey, hashValue) -> dataMap.put(decodeHashKey(hashKey), hashValue)); + return dataMap; + } + + /** + * 通过键获取所有的hash数据 + * @param key 键 + * @return + */ + public abstract Map getData(K key); + + /** + * 通过缓存键和hash键获取hash值 + * @param key 缓存键 + * @param hashKey hash键 + * @return hash值 + */ + public abstract HV getData(K key, HK hashKey); + + /** + * 默认值 + */ + public abstract Map defaultValue(); + public abstract HV defaultHashValue(); +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/getDataAbs.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/getDataAbs.java new file mode 100644 index 0000000..b9186b0 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/getDataAbs.java @@ -0,0 +1,22 @@ +package com.muyu.common.cache.abs; + +import com.muyu.common.cache.GetData; + +/** + * getDataAbs + * + * @author LeYang + * on 2024/4/1 + */ +public abstract class getDataAbs implements GetData { + + @Override + public V getData(K key) { + return null; + } + + @Override + public V defaultValue() { + return null; + } +} diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/decoration/DecorationKey.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/decoration/DecorationKey.java new file mode 100644 index 0000000..661ef55 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/common/cache/decoration/DecorationKey.java @@ -0,0 +1,30 @@ +package com.muyu.common.cache.decoration; + +/** + * @author yangle + * @description: 装饰Key + * @Date 2024-3-29 下午 03:19 + */ +public interface DecorationKey { + + /** + * key前缀 + * @return key前缀 + */ + public String keyPre(); + + + /** + * 编码 + * @param key ID + * @return 键 + */ + public String encode(K key); + + /** + * 解码 + * @param redisKey 数据库键 + * @return ID + */ + public K decode(String redisKey); +} diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java index 70faa40..7663175 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java @@ -39,6 +39,9 @@ public class Result implements Serializable { private T data; + public static Result buildCode(int code,String msg,T data){ + return restResult(data,code,msg); + } public static Result success () { return restResult(null, SUCCESS, null); } @@ -93,6 +96,7 @@ public class Result implements Serializable { return restResult(null, code, msg); } + private static Result restResult (T data, int code, String msg) { return Result.builder() .code(code) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java index 35f459c..89ea516 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.ObjectUtils; import java.math.BigDecimal; /** - * @author DongZl + * @author yangle * @description: 对象工具类 * @Date 2023-10-9 下午 04:56 */ diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index db90c1e..8ed36f1 100644 --- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -229,10 +229,14 @@ public class RedisService { * * @return Hash对象集合 */ - public List getMultiCacheMapValue (final String key, final Collection hKeys) { + public List getMultiCacheMapValue (final String key, final Collection hKeys) { return redisTemplate.opsForHash().multiGet(key, hKeys); } + public boolean hashKey(final String key,final String hashkey){ + return this.redisTemplate.opsForHash().hasKey(key, hashkey); + } + /** * 删除Hash中的某条数据 * @@ -255,4 +259,24 @@ public class RedisService { public Collection keys (final String pattern) { return redisTemplate.keys(pattern); } + + /** + * 减少序列值 + * @param key key + * @param number 值 + * @return 操作后的值 + */ + public Long decrement(final String key,Long number){ + return redisTemplate.opsForValue().decrement(key,number); + } + + /** + * 增加序列值 + * @param key key + * @param number 值 + * @return 操作后的值 + */ + public Long increment(final String key,Long number){ + return redisTemplate.opsForValue().increment(key,number); + } } diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java b/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java index bd12aad..4be7ab0 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java +++ b/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author DongZl + * @author yangle * @description: 验证码 * @Date 2023-11-12 下午 03:36 */ diff --git a/muyu-modules/muyu-product/muyu-product-cache/pom.xml b/muyu-modules/muyu-product/muyu-product-cache/pom.xml index 30250af..a0e70a3 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/pom.xml +++ b/muyu-modules/muyu-product/muyu-product-cache/pom.xml @@ -16,17 +16,20 @@ 17 UTF-8 - - - - com.muyu - muyu-common-cache - - - - com.muyu - muyu-product-common - - + + + + + com.muyu + muyu-common-cache + + + + + com.muyu + muyu-product-common + + + diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuCache.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuCache.java new file mode 100644 index 0000000..c004026 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuCache.java @@ -0,0 +1,88 @@ +package com.muyu.product.cache; + +import com.muyu.common.cache.abs.HashCacheAbs; +import com.muyu.common.core.text.Convert; +import com.muyu.product.cache.datasource.ProjectSkuData; +import com.muyu.product.domain.ProjectSkuInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author yangle + * @description: 商品sku基本信息 + * @Date 2024-3-29 下午 03:06 + */ +@Component +public class ProjectSkuCache extends HashCacheAbs { + + @Autowired + private ProjectSkuData projectSkuData; + + + /** + * key前缀 + * @return key前缀 + */ + @Override + public String keyPre () { + return "project:sku:"; + } + + /** + * 解码 + * @param redisKey 数据库键 + * @return ID + */ + @Override + public Long decode (String redisKey) { + return Convert.toLong(redisKey.replace(keyPre(), "")); + } + + /** + * 解码 + * @param redisHashKey 数据库键 + * @return ID + */ + @Override + public String decodeHashKey (String redisHashKey) { + return redisHashKey; + } + + /** + * 通过键获取所有的hash数据 + * @param key 键 + * @return + */ + @Override + public Map getData (Long key) { + return projectSkuData.getData(key); + } + + /** + * 通过缓存键和hash键获取hash值 + * @param key 缓存键 + * @param hashKey hash键 + * + * @return hash值 + */ + @Override + public ProjectSkuInfo getData (Long key, String hashKey) { + return projectSkuData.getData(key, hashKey); + } + + /** + * 默认值 + */ + @Override + public Map defaultValue () { + return new HashMap<>(); + } + + @Override + public ProjectSkuInfo defaultHashValue () { + return new ProjectSkuInfo(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuStockCache.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuStockCache.java new file mode 100644 index 0000000..a3c17b6 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectSkuStockCache.java @@ -0,0 +1,61 @@ +package com.muyu.product.cache; + +import com.muyu.common.cache.abs.AtomicSequenceCacheAbs; +import com.muyu.common.core.text.Convert; +import com.muyu.product.cache.datasource.ProjectSkuStockData; +import com.muyu.product.cache.key.SkuStockKey; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author yangle + * @description: 商品SKU库存缓存 + * @Date 2024-3-29 下午 03:06 + */ +@Service +public class ProjectSkuStockCache extends AtomicSequenceCacheAbs { + + @Autowired + private ProjectSkuStockData projectSkuStockData; + + /** + * key前缀 + * + * @return key前缀 + */ + @Override + public String keyPre () { + return "project:sku:stock:"; + } + + + /** + * 编码 + * @param skuStockKey ID + * @return 键 + */ + @Override + public String encode (SkuStockKey skuStockKey) { + return keyPre() + skuStockKey.getProjectId() + ":" + skuStockKey.getSku(); + } + + @Override + public Long getData (SkuStockKey key) { + return projectSkuStockData.getData(key); + } + + /** + * 解码 + * @param redisKey 数据库键 + * @return ID + */ + @Override + public SkuStockKey decode (String redisKey) { + String[] split = redisKey.replace(keyPre(), "").split(":"); + return SkuStockKey.builder() + .projectId(Convert.toLong(split[0])) + .sku(split[1]) + .build(); + } + +} diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectInfoData.java similarity index 52% rename from muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java rename to muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectInfoData.java index 7249e7c..cc5aa2d 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectInfoData.java @@ -1,18 +1,18 @@ -package com.muyu.product.cache; +package com.muyu.product.cache.datasource; import com.muyu.product.domain.ProjectInfo; /** - * 缓存数据获取 ProjectInfoData - * - * @author LeYang - * on 2024/3/27 + * @author yangle + * @description: 缓存数据获取 + * @Date 2024-3-27 下午 03:34 */ public interface ProjectInfoData { + /** * 从数据库获取数据 * @param key ID * @return 缓存对象 */ - public ProjectInfo getData(Long key); + public ProjectInfo getData (Long key); } diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuData.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuData.java new file mode 100644 index 0000000..b10ae9d --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuData.java @@ -0,0 +1,29 @@ +package com.muyu.product.cache.datasource; + +import com.muyu.product.domain.ProjectSkuInfo; + +import java.util.Map; + +/** + * @author yangle + * @description: 商品SKU数据库读取 + * @Date 2024-4-1 上午 11:35 + */ +public interface ProjectSkuData { + + /** + * 通过键获取所有的hash数据 + * @param projectId 商品ID + * @return + */ + public Map getData (Long projectId) ; + + /** + * 通过缓存键和hash键获取hash值 + * @param projectId 商品ID + * @param projectSku 商品SKU + * + * @return hash值 + */ + public ProjectSkuInfo getData (Long projectId, String projectSku); +} diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuStockData.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuStockData.java new file mode 100644 index 0000000..a952077 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/ProjectSkuStockData.java @@ -0,0 +1,13 @@ +package com.muyu.product.cache.datasource; + +import com.muyu.product.cache.key.SkuStockKey; + +/** + * @author yangle + * @description: SKU库存 + * @Date 2024-4-2 上午 10:52 + */ +public interface ProjectSkuStockData { + + public Long getData (SkuStockKey key) ; +} diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/key/SkuStockKey.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/key/SkuStockKey.java new file mode 100644 index 0000000..8cb2b21 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/key/SkuStockKey.java @@ -0,0 +1,28 @@ +package com.muyu.product.cache.key; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author yangle + * @description: 商品SKU库存Key + * @Date 2024-4-2 上午 10:41 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SkuStockKey { + + /** + * 商品ID + */ + private Long projectId; + + /** + * sku + */ + private String sku; +} diff --git a/muyu-modules/muyu-product/muyu-product-common/pom.xml b/muyu-modules/muyu-product/muyu-product-common/pom.xml index a1e6024..cfc22b9 100644 --- a/muyu-modules/muyu-product/muyu-product-common/pom.xml +++ b/muyu-modules/muyu-product/muyu-product-common/pom.xml @@ -23,5 +23,9 @@ com.muyu muyu-common-core + + com.muyu + muyu-shop-cart-common + diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java index 031d1fc..eb87bd4 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性与组中间对象 as_attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java index 0d1e2ef..55bd3f4 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsBrandProject.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌商品中间对象 as_brand_project * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java index 829aeef..9e0e97e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类属性中间对象 as_category_attribute * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java index 5a61e15..aadd723 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttributeGroup.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类属性组中间对象 as_category_attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java index e40bb11..d4a6471 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryBrand.java @@ -16,7 +16,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品类品牌中间对象 as_category_brand * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java index 96641dd..94c655c 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsProductAttributeInfo.java @@ -20,7 +20,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 as_product_attribute_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index e9450e2..ac91022 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -20,7 +20,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java index 2071ddc..d8722e5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java @@ -21,7 +21,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java index d94d3af..9bf75c8 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java index 918b02c..4e9804f 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java @@ -23,7 +23,7 @@ import java.util.function.Supplier; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java index 1d31c59..bfd20c5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java index fb399de..1edb629 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CommentLikeInfo.java @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java index c71a51b..bd27b77 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java index 76af0e6..831451b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectSkuInfo.java @@ -22,7 +22,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java index 131611e..a1c054a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttrInfo.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java index 454cbad..aa3c7af 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleInfo.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/CategoryBase.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/CategoryBase.java index ae3b33c..4e80c4b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/CategoryBase.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/base/CategoryBase.java @@ -1,7 +1,7 @@ package com.muyu.product.domain.base; /** - * @author DongZl + * @author yangle * @description: attribute基础方法 * @Date 2024-3-1 下午 02:28 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java index eecfb3f..c7f0389 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java @@ -14,7 +14,7 @@ import java.util.List; /** - * @author DongZl + * @author yangle * @description: 属性组添加模型 * @Date 2024-2-28 下午 03:16 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java index 8a77303..9c971fc 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java @@ -18,7 +18,7 @@ import java.util.function.Supplier; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java index e293352..99d427f 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java @@ -14,7 +14,7 @@ import java.util.List; /** - * @author DongZl + * @author yangle * @description: 规格属性,添加模型 * @Date 2024-3-4 下午 02:28 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java index d2742b3..9c5e4af 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleInfoAddModel.java @@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 规格保存模型 * @Date 2024-3-4 下午 02:33 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ShoppingCardModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ShoppingCardModel.java new file mode 100644 index 0000000..2660918 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/ShoppingCardModel.java @@ -0,0 +1,47 @@ +package com.muyu.product.domain.model; + +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 添加购物车模型 ShoppingCardAdd + * + * @author LeYang + * on 2024/3/31 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ShoppingCardModel extends BaseEntity { + /** + * 商品id + */ + private Integer projectId; + + /** + * 商品属性 + */ + private String projectSku; + + /** + * 用户信息 + */ + private Integer userId; + + /** + * 库存 + */ + private Integer num; + + /** + * 选中状态 + */ + private Integer isSelected; + +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java index 3258cc8..c2ca8e4 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.function.Supplier; /** - * @author DongZl + * @author yangle * @description: 共有属性组 * @Date 2024-3-6 下午 02:29 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java index ebd44da..072acc5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeModel.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @author DongZl + * @author yangle * @description: 共有属性 * @Date 2024-3-6 下午 02:30 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java index 4bb09f8..826c877 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java index 4a85156..b11090a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupQueryReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java index 609dbab..08f1b74 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupSaveReq.java @@ -15,7 +15,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 属性组对象 attribute_group * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java index 20d95cd..fc2d1b8 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoEditReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java index aba8144..b7599c8 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java index 893ddba..0b6fd77 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java @@ -13,7 +13,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品属性对象 attribute_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java index b9b6c4d..ad3484a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java index 5c17d05..24c9740 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java index 15d7c84..5a686f5 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/BrandInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 品牌信息对象 brand_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java index 2b9bbdc..c3cd72a 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoEditReq.java @@ -13,7 +13,7 @@ import java.util.List; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java index fcfbd47..71088c2 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.TreeEntity; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java index f65452b..cc9b882 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryInfoSaveReq.java @@ -13,7 +13,7 @@ import java.util.List; /** * 品类信息对象 category_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java index 58069f0..d1ee559 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java index 885abe8..52b33bc 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java index a547ded..1690e24 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品评论对象 comment_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java index 854308b..8034222 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java index 25737d6..14e5aab 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java index 89396ef..9d227f1 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CommentLikeInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 评论点赞对象 comment_like_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java index 9042c74..71c4ec9 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java @@ -16,7 +16,7 @@ import java.util.List; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java index dd509ac..99ef7c7 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java index 2a3601b..7ca1028 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoSaveReq.java @@ -16,7 +16,7 @@ import java.util.List; /** * 商品信息对象 project_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java index e28d898..b88e2cd 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoEditReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java index 48e9f4f..f447c22 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoQueryReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java index 26856fc..984787b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectSkuInfoSaveReq.java @@ -12,7 +12,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品SKU对象 project_sku_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java index 7f14789..e74a6e8 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java index f003eb7..2012064 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java index d05e745..b50b48d 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleAttrInfoSaveReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 规格详情对象 rule_attr_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java index bc9d602..fa0c407 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java index 3c50d3a..621db8d 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoQueryReq.java @@ -11,7 +11,7 @@ import com.muyu.common.core.web.domain.BaseEntity; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java index c6ef9ff..ebafc8b 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoSaveReq.java @@ -14,7 +14,7 @@ import java.util.List; /** * 商品规格对象 rule_info * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Data diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupPageResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupPageResp.java index 7936caf..f25231e 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupPageResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupPageResp.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.function.Function; /** - * @author DongZl + * @author yangle * @description: 属性组列表对象 * @Date 2024-2-28 下午 04:15 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryCommonElementResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryCommonElementResp.java index b69efda..090e428 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryCommonElementResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryCommonElementResp.java @@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 商品类别公共元素 * @Date 2024-3-6 下午 02:25 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryParentCommonElementResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryParentCommonElementResp.java index ba5576a..fa949ae 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryParentCommonElementResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryParentCommonElementResp.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 类别父通用元素 * @Date 2024-3-1 上午 11:02 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java index 8596383..94040fc 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleInfoResp.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.function.Function; /** - * @author DongZl + * @author yangle * @description: 规格返回结果集 * @Date 2024-3-4 下午 04:08 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ShoppingCardResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ShoppingCardResp.java new file mode 100644 index 0000000..5536ee5 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ShoppingCardResp.java @@ -0,0 +1,59 @@ +package com.muyu.product.domain.resp; + +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.shop.cart.domain.CartInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 添加购物车模型 ShoppingCardAdd + * + * @author LeYang + * on 2024/3/31 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ShoppingCardResp extends BaseEntity { + /** + * 商品id + */ + private Integer projectId; + + /** + * 商品属性 + */ + private String projectSku; + + /** + * 用户信息 + */ + private Integer userId; + + /** + * 库存 + */ + private Integer num; + + /** + * 选中状态 + */ + private Integer isSelected; + + /** + * 备注 + */ + private String remark; + + /** + * 备注 + */ + private String createBy; + + +} diff --git a/muyu-modules/muyu-product/muyu-product-server/pom.xml b/muyu-modules/muyu-product/muyu-product-server/pom.xml index 362c1b5..5d82eaf 100644 --- a/muyu-modules/muyu-product/muyu-product-server/pom.xml +++ b/muyu-modules/muyu-product/muyu-product-server/pom.xml @@ -18,11 +18,12 @@ - + com.muyu muyu-product-cache + com.muyu @@ -89,18 +90,6 @@ com.muyu muyu-common-swagger - - com.muyu - muyu-product-cache - 3.6.3 - compile - - - com.muyu - muyu-product-cache - 3.6.3 - compile - diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java index cf793c9..6e2794d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; /** - * @author DongZl + * @author yangle * @description: 商品启动类 * @Date 2024-2-26 下午 04:07 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/ProjectInfoDataImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectInfoDataImpl.java similarity index 61% rename from muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/ProjectInfoDataImpl.java rename to muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectInfoDataImpl.java index b5b496b..b1375f1 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/ProjectInfoDataImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectInfoDataImpl.java @@ -1,18 +1,19 @@ -package com.muyu.product.cache; +package com.muyu.product.cache.impl; +import com.muyu.product.cache.datasource.ProjectInfoData; import com.muyu.product.domain.ProjectInfo; import com.muyu.product.service.ProjectInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * 缓存数据获取 ProjectInfoDataImpl - * - * @author LeYang - * on 2024/3/27 + * @author yangle + * @description: 缓存数据获取 + * @Date 2024-3-27 下午 03:37 */ @Service -public class ProjectInfoDataImpl implements ProjectInfoData{ +public class ProjectInfoDataImpl implements ProjectInfoData { + @Autowired private ProjectInfoService projectInfoService; @@ -22,7 +23,7 @@ public class ProjectInfoDataImpl implements ProjectInfoData{ * @return 缓存对象 */ @Override - public ProjectInfo getData(Long key){ + public ProjectInfo getData (Long key) { return projectInfoService.getById(key); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuDataImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuDataImpl.java new file mode 100644 index 0000000..902ef52 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuDataImpl.java @@ -0,0 +1,52 @@ +package com.muyu.product.cache.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.product.cache.datasource.ProjectSkuData; +import com.muyu.product.domain.ProjectSkuInfo; +import com.muyu.product.service.ProjectSkuInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author yangle + * @description: 商品SKU实现类 + * @Date 2024-4-1 上午 11:38 + */ +@Service +public class ProjectSkuDataImpl implements ProjectSkuData { + + @Autowired + private ProjectSkuInfoService projectSkuInfoService; + + /** + * 通过键获取所有的hash数据 + * @param projectId 商品ID + * @return + */ + @Override + public Map getData (Long projectId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectSkuInfo::getProjectId, projectId); + List projectSkuInfoList = projectSkuInfoService.list(queryWrapper); + return projectSkuInfoList.stream() + .collect(Collectors.toMap(ProjectSkuInfo::getSku, projectSkuInfo -> projectSkuInfo)); + } + + /** + * 通过缓存键和hash键获取hash值 + * @param projectId 商品ID + * @param projectSku 商品SKU + * @return hash值 + */ + @Override + public ProjectSkuInfo getData (Long projectId, String projectSku) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectSkuInfo::getProjectId, projectId); + queryWrapper.eq(ProjectSkuInfo::getSku, projectSku); + return projectSkuInfoService.getOne(queryWrapper); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuStockDataImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuStockDataImpl.java new file mode 100644 index 0000000..5d8f3ac --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/cache/impl/ProjectSkuStockDataImpl.java @@ -0,0 +1,30 @@ +package com.muyu.product.cache.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.product.cache.datasource.ProjectSkuStockData; +import com.muyu.product.cache.key.SkuStockKey; +import com.muyu.product.domain.ProjectSkuInfo; +import com.muyu.product.service.ProjectSkuInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author yangle + * @description: sku库存实现类 + * @Date 2024-4-2 上午 10:53 + */ +@Service +public class ProjectSkuStockDataImpl implements ProjectSkuStockData { + + @Autowired + private ProjectSkuInfoService projectSkuInfoService; + + @Override + public Long getData (SkuStockKey key) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectSkuInfo::getProjectId, key.getProjectId()); + queryWrapper.eq(ProjectSkuInfo::getSku, key.getSku()); + ProjectSkuInfo projectSkuInfo = projectSkuInfoService.getOne(queryWrapper); + return projectSkuInfo.getStock(); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index bd489a0..b255f02 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -31,7 +31,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 属性组Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "属性组") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java index 4b09002..78f41e5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品属性Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "商品属性") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java index d0302a5..0af0489 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java @@ -30,7 +30,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 品牌信息Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "品牌信息") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index 7d37e98..0326a80 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -36,7 +36,7 @@ import com.muyu.product.service.CategoryInfoService; /** * 品类信息Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "品类信息") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java index 9500949..f7a93c2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品评论Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "商品评论") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java index 9e7b5b6..8965b2b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 评论点赞Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "评论点赞") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index 0e216f0..9db9c22 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java @@ -6,14 +6,11 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.product.domain.AsProductAttributeInfo; import com.muyu.product.domain.ProjectSkuInfo; -import com.muyu.product.domain.model.CategoryInfoSaveModel; -import com.muyu.product.domain.model.ProductSkuModel; import com.muyu.product.domain.model.ProjectAddModel; import com.muyu.product.domain.resp.ProjectDetailResp; import com.muyu.product.service.AsProductAttributeInfoService; import com.muyu.product.service.ProjectSkuInfoService; import io.swagger.annotations.*; -import org.apache.commons.lang3.SystemUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,7 +36,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品信息Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "商品信息") @@ -162,4 +159,8 @@ public class ProjectInfoController extends BaseController { projectInfoService.del(ids); return toAjax(projectInfoService.removeBatchByIds(ids)); } + + + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java index 38bc481..3135d95 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品SKUController * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "商品SKU") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java index 2ed4b7b..a62c8d7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java @@ -29,7 +29,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 规格详情Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "规格详情") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index b6a9c73..a5f9599 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java @@ -32,7 +32,7 @@ import com.muyu.common.core.web.page.TableDataInfo; /** * 商品规格Controller * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Api(tags = "商品规格") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java index 1b420df..0ca754b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsAttributeGroup; /** * 属性与组中间Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsAttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java index a78f814..725393a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsBrandProjectMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsBrandProject; /** * 品牌商品中间Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsBrandProjectMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java index b09e788..41585b5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryAttributeGroup; /** * 品类属性组中间Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryAttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java index 66c2e87..afc4e32 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryAttributeMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryAttribute; /** * 品类属性中间Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryAttributeMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java index 3e8c164..fabb30b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsCategoryBrandMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsCategoryBrand; /** * 品类品牌中间Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryBrandMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java index 4350c22..c4348cb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsProductAttributeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AsProductAttributeInfo; /** * 商品属性Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsProductAttributeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java index 9f1acd3..9ec2b03 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AttributeGroup; /** * 属性组Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AttributeGroupMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java index 8d00d2e..766a0d4 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.AttributeInfo; /** * 商品属性Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AttributeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java index 97519e1..640243b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.BrandInfo; /** * 品牌信息Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface BrandInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java index 6c95e40..9ab8710 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 品类信息Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Mapper diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java index 9badc38..4184ec1 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.CommentInfo; /** * 商品评论Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface CommentInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java index 8b28651..38eafdb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CommentLikeInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.CommentLikeInfo; /** * 评论点赞Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface CommentLikeInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java index 04e5b3d..193aad6 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.ProjectInfo; /** * 商品信息Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface ProjectInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java index 903c14d..2309e9a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProjectSkuInfoMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 商品SKUMapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Mapper diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java index b51378c..36d7fb5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleAttrInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.RuleAttrInfo; /** * 规格详情Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface RuleAttrInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java index 497a29a..50cb495 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleInfoMapper.java @@ -7,7 +7,7 @@ import com.muyu.product.domain.RuleInfo; /** * 商品规格Mapper接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface RuleInfoMapper extends BaseMapper { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java index db672c4..e2f6aff 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 属性与组中间Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsAttributeGroupService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java index b30f7c2..c85514e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsBrandProjectService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品牌商品中间Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsBrandProjectService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java index fb3b15f..76446ba 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeGroupService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类属性组中间Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryAttributeGroupService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java index 365d74b..17036d9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryAttributeService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类属性中间Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryAttributeService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java index a1ccaa9..be3fab4 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsCategoryBrandService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 品类品牌中间Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsCategoryBrandService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java index 152bb77..f51d7cb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsProductAttributeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品属性Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AsProductAttributeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java index ca46bf7..d3d95ca 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java @@ -13,7 +13,7 @@ import com.muyu.product.domain.resp.AttributeGroupPageResp; /** * 属性组Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AttributeGroupService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java index 14d9431..eb48ffa 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品属性Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface AttributeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java index 9864b33..89e22a7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/BrandInfoService.java @@ -8,7 +8,7 @@ import com.muyu.product.domain.req.BrandInfoEditReq; /** * 品牌信息Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface BrandInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java index 0b7f81b..67cfc68 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CategoryInfoService.java @@ -15,7 +15,7 @@ import com.muyu.product.domain.resp.CategoryParentCommonElementResp; /** * 品类信息Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface CategoryInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java index 54fbcca..7387b25 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品评论Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface CommentInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java index 4c72f34..e6e2822 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentLikeInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 评论点赞Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface CommentLikeInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java index 8022198..e397490 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java @@ -12,7 +12,7 @@ import com.muyu.product.domain.resp.ProjectDetailResp; /** * 商品信息Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface ProjectInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java index 3706c08..235b242 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectSkuInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 商品SKUService接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface ProjectSkuInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java index e71e8d8..b1c498e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleAttrInfoService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 规格详情Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface RuleAttrInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java index 54c5b08..cce3398 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/RuleInfoService.java @@ -12,7 +12,7 @@ import com.muyu.product.domain.resp.RuleInfoResp; /** * 商品规格Service接口 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ public interface RuleInfoService extends IService { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java index 7e2e186..663cc9c 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 属性与组中间Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java index e5c906d..f20af0d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsBrandProjectServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品牌商品中间Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java index a279181..4c77b4c 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeGroupServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类属性组中间Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java index 48e263d..3388c6e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类属性中间Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java index ec71806..61ba2c3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryBrandServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品类品牌中间Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java index 2cc3206..27bc866 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsProductAttributeInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品属性Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java index 85f52d1..72e8bfb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java @@ -26,7 +26,7 @@ import java.util.stream.Stream; /** * 属性组Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java index 0da9ac8..6d57290 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java @@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品属性Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java index 1e5a46c..d9ced69 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 品牌信息Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java index b19e49a..f82a8a2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java @@ -33,7 +33,7 @@ import java.util.stream.Stream; /** * 品类信息Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java index 365a5c4..26c67cb 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品评论Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java index ae7f281..cacdfd4 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentLikeInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 评论点赞Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java index a7a28db..7223e9a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品信息Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java index ed42d5c..6aa9561 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectSkuInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品SKUService业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java index ec1b4f1..938c505 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleAttrInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 规格详情Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java index 3018b05..d4db750 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleInfoServiceImpl.java @@ -30,7 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** * 商品规格Service业务层处理 * - * @author DongZeLiang + * @author yangle * @date 2024-02-27 */ @Slf4j diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/pom.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/pom.xml new file mode 100644 index 0000000..1b860bd --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.muyu + muyu + 3.6.3 + ../../../pom.xml + + + muyu-shop-cart-cache + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-shop-cart-common + + + + + com.muyu + muyu-common-cache + + + org.projectlombok + lombok + + + org.projectlombok + lombok + + + diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java new file mode 100644 index 0000000..895bd74 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java @@ -0,0 +1,88 @@ +package com.muyu.shop.cart.cache; + +import com.muyu.common.cache.abs.HashCacheAbs; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.exception.ServiceException; +import com.muyu.common.core.text.Convert; +import com.muyu.shop.cart.cache.key.CartHashKey; +import com.muyu.shop.cart.cache.sourcedata.CartData; +import com.muyu.shop.cart.domain.CartInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; + +/** + * 购物车缓存 + * + * @author LeYang + * on 2024/4/2 + */ + +@Component +public class CartCache extends HashCacheAbs { + @Autowired + private CartData cartData; + + @Override + public String keyPre() { + return "cart:info"; + } + + /** + * 解码 + * @param redisKey 数据库键 + * @return ID + */ + @Override + public Long decode(String redisKey) { + return Convert.toLong(redisKey.replace(keyPre(),"")); + } + + /** + * 解码 + * @param redisHashKey 数据库键 + * @return ID + */ + @Override + public CartHashKey decodeHashKey(String redisHashKey) { + String[] split = redisHashKey.split(":"); + return CartHashKey.builder() + .projectId(Convert.toLong(split[0])) + .projectSku(split[1]) + .build(); + } + + /** + * 通过键获取所有的hash数据 + * @param key 键 + * @return + */ + @Override + public Map getData(Long key) { + return cartData.getData(key); + } + + /** + * 通过缓存键和hash键获取hash值 + * @param key 缓存键 + * @param hashKey hash键 + * @return + */ + @Override + public CartInfo getData(Long key, CartHashKey hashKey) { + return cartData.getData(key,hashKey); + } + + @Override + public Map defaultValue() { + throw new ServiceException("购物车无数据",Result.SUCCESS); + } + + @Override + public CartInfo defaultHashValue() { + throw new ServiceException("购物车无数据",Result.SUCCESS); + } + + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/key/CartHashKey.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/key/CartHashKey.java new file mode 100644 index 0000000..548b148 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/key/CartHashKey.java @@ -0,0 +1,29 @@ +package com.muyu.shop.cart.cache.key; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 购物车HashKey + * + * @author LeYang + * on 2024/4/2 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CartHashKey { + + /** + * 商品ID + */ + private Long projectId; + /** + * 商品sku + */ + private String projectSku; + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/sourcedata/CartData.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/sourcedata/CartData.java new file mode 100644 index 0000000..11a3e81 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/sourcedata/CartData.java @@ -0,0 +1,29 @@ +package com.muyu.shop.cart.cache.sourcedata; + +import com.muyu.shop.cart.cache.key.CartHashKey; +import com.muyu.shop.cart.domain.CartInfo; + +import java.util.Map; + +/** + * 购物车源数据获取 CartData + * + * @author LeYang + * on 2024/4/2 + */ +public interface CartData { + /** + * 通过键获取所有的hash数据 + * @param key + * @return + */ + public Map getData(Long key); + + /** + * 通过缓存和hash键获取hash值 + * @param key 缓存键 + * @param cartHashKey hash值 + * @return hash值 + */ + public CartInfo getData(Long key,CartHashKey cartHashKey); +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java index 1132d3c..9421423 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java @@ -82,9 +82,7 @@ public class CartInfo extends BaseEntity { return CartInfo.builder() .projectId(cartInfoSaveReq.getProjectId()) .projectSku(cartInfoSaveReq.getProjectSku()) - .userId(cartInfoSaveReq.getUserId()) .num(cartInfoSaveReq.getNum()) - .isSelected(cartInfoSaveReq.getIsSelected()) .build(); } diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java index 6affb81..6ce6046 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java @@ -23,10 +23,6 @@ public class CartInfoSaveReq extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键 */ - - @ApiModelProperty(name = "主键", value = "主键") - private Long id; /** 商品 */ @@ -38,19 +34,13 @@ public class CartInfoSaveReq extends BaseEntity { @ApiModelProperty(name = "sku", value = "sku", required = true) private String projectSku; - /** 用户 */ - @ApiModelProperty(name = "用户", value = "用户", required = true) - private Long userId; /** 数量 */ @ApiModelProperty(name = "数量", value = "数量", required = true) private Long num; - /** 是否选中 */ - @ApiModelProperty(name = "是否选中", value = "是否选中", required = true) - private String isSelected; } diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml index 540f5a5..758dc87 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml @@ -84,7 +84,16 @@ com.muyu muyu-shop-cart-common - ${muyu.version} + + + + + com.muyu + muyu-shop-cart-cache + + + com.muyu + muyu-product-common diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/MuYuShopCartApplication.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/MuYuShopCartApplication.java new file mode 100644 index 0000000..759f553 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/MuYuShopCartApplication.java @@ -0,0 +1,22 @@ +package com.muyu.shop.cart; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 购物车服务 + * + * @author muyu + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuShopCartApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuShopCartApplication.class, args); + } +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectInfoDataImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectInfoDataImpl.java new file mode 100644 index 0000000..4975225 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectInfoDataImpl.java @@ -0,0 +1,25 @@ +package com.muyu.shop.cart.cache.impl; + + +import org.springframework.stereotype.Service; + +/** + * @author yangle + * @description: 缓存数据获取 + * @Date 2024-3-27 下午 03:37 + */ +@Service +public class ProjectInfoDataImpl { + + + /** + * 从数据库获取数据 + * @param key ID + * @return 缓存对象 + */ +// @Override +// public ProjectInfo getData (Long key) { +// return new ProjectInfo(); +// } +//} +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuDataImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuDataImpl.java new file mode 100644 index 0000000..8962b1d --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuDataImpl.java @@ -0,0 +1,36 @@ +//package com.muyu.shop.cart.cache.impl; +// +//import com.muyu.product.domain.ProjectSkuInfo; +//import org.springframework.stereotype.Service; +// +//import java.util.HashMap; +//import java.util.Map; +// +///** +// * @author yangle +// * @description: 商品SKU实现类 +// * @Date 2024-4-1 上午 11:38 +// */ +//@Service +//public class ProjectSkuDataImpl implements ProjectSkuData { +// +// /** +// * 通过键获取所有的hash数据 +// * @param projectId 商品ID +// * @return +// */ +// @Override +// public Map getData (Long projectId) { +// return new HashMap<>(); } +// +// /** +// * 通过缓存键和hash键获取hash值 +// * @param projectId 商品ID +// * @param projectSku 商品SKU +// * @return hash值 +// */ +// @Override +// public ProjectSkuInfo getData (Long projectId, String projectSku) { +// return new ProjectSkuInfo(); +// } +//} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuStockDataImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuStockDataImpl.java new file mode 100644 index 0000000..34a70b0 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/cache/impl/ProjectSkuStockDataImpl.java @@ -0,0 +1,18 @@ +//package com.muyu.shop.cart.cache.impl; +// +//import com.muyu.product.cache.datasource.ProjectSkuStockData; +//import org.springframework.stereotype.Service; +// +///** +// * @author yangle +// * @description: sku库存实现类 +// * @Date 2024-4-2 上午 10:53 +// */ +//@Service +//public class ProjectSkuStockDataImpl implements ProjectSkuStockData { +// +// @Override +// public Long getData (SkuStockKey key) { +// return 0L; +// } +//} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java new file mode 100644 index 0000000..2ee9eae --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java @@ -0,0 +1,111 @@ +package com.muyu.shop.cart.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.shop.cart.domain.CartInfo; +import com.muyu.shop.cart.domain.req.CartInfoQueryReq; +import com.muyu.shop.cart.domain.req.CartInfoSaveReq; +import com.muyu.shop.cart.domain.req.CartInfoEditReq; +import com.muyu.shop.cart.service.CartInfoService; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 购物车Controller + * + * @author muyu + * @date 2024-03-29 + */ +@Api(tags = "购物车") +@RestController +@RequestMapping("/info") +public class CartInfoController extends BaseController { + @Autowired + private CartInfoService cartInfoService; + + /** + * 查询购物车列表 + */ + @ApiOperation("获取购物车列表") + @RequiresPermissions("shopCart:info:list") + @GetMapping("/list") + public Result> list(CartInfoQueryReq cartInfoQueryReq) { + startPage(); + List list = cartInfoService.list(CartInfo.queryBuild(cartInfoQueryReq)); + return getDataTable(list); + } + + /** + * 导出购物车列表 + */ + @ApiOperation("导出购物车列表") + @RequiresPermissions("shopCart:info:export") + @Log(title = "购物车", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CartInfo cartInfo) { + List list = cartInfoService.list(cartInfo); + ExcelUtil util = new ExcelUtil(CartInfo.class); + util.exportExcel(response, list, "购物车数据"); + } + + /** + * 获取购物车详细信息 + */ + @ApiOperation("获取购物车详细信息") + @RequiresPermissions("shopCart:info:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(cartInfoService.getById(id)); + } + + /** + * 新增购物车 + */ + @RequiresPermissions("shopCart:info:add") + @Log(title = "购物车", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增购物车") + public Result add(@RequestBody CartInfoSaveReq cartInfoSaveReq) { + return toAjax(cartInfoService.add(CartInfo.saveBuild(cartInfoSaveReq))); + } + + /** + * 修改购物车 + */ + @RequiresPermissions("shopCart:info:edit") + @Log(title = "购物车", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改购物车") + public Result edit(@PathVariable Long id, @RequestBody CartInfoEditReq cartInfoEditReq) { + return toAjax(cartInfoService.updateById(CartInfo.editBuild(id,cartInfoEditReq))); + } + + /** + * 删除购物车 + */ + @RequiresPermissions("shopCart:info:remove") + @Log(title = "购物车", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除购物车") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(cartInfoService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/mapper/CartInfoMapper.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/mapper/CartInfoMapper.java new file mode 100644 index 0000000..d0f2ecc --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/mapper/CartInfoMapper.java @@ -0,0 +1,15 @@ +package com.muyu.shop.cart.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.shop.cart.domain.CartInfo; + +/** + * 购物车Mapper接口 + * + * @author muyu + * @date 2024-03-29 + */ +public interface CartInfoMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/CartInfoService.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/CartInfoService.java new file mode 100644 index 0000000..001d906 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/CartInfoService.java @@ -0,0 +1,28 @@ +package com.muyu.shop.cart.service; + +import java.util.List; +import com.muyu.shop.cart.domain.CartInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 购物车Service接口 + * + * @author muyu + * @date 2024-03-29 + */ +public interface CartInfoService extends IService { + /** + * 查询购物车列表 + * + * @param cartInfo 购物车 + * @return 购物车集合 + */ + public List list(CartInfo cartInfo); + + /** + * 添加购物车 + * @param saveBuild 购物车信息 + * @return 是否添加成功 + */ + boolean add(CartInfo saveBuild); +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java new file mode 100644 index 0000000..5ef852b --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java @@ -0,0 +1,110 @@ +package com.muyu.shop.cart.service.impl; + +import java.util.List; + +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.shop.cart.cache.CartCache; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.muyu.shop.cart.mapper.CartInfoMapper; +import com.muyu.shop.cart.domain.CartInfo; +import com.muyu.shop.cart.service.CartInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 购物车Service业务层处理 + * + * @author muyu + * @date 2024-03-29 + */ +@Slf4j +@Service +public class CartInfoServiceImpl extends ServiceImpl implements CartInfoService { + + @Autowired + private CartCache cartCache; +// @Autowired +// private ProjectSkuStockCache projectSkuStockCache; + /** + * 查询购物车列表 + * + * @param cartInfo 购物车 + * @return 购物车 + */ + @Override + public List list(CartInfo cartInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(cartInfo.getProjectId())){ + queryWrapper.eq(CartInfo::getProjectId, cartInfo.getProjectId()); + } + + if (ObjUtils.notNull(cartInfo.getProjectSku())){ + queryWrapper.eq(CartInfo::getProjectSku, cartInfo.getProjectSku()); + } + + if (ObjUtils.notNull(cartInfo.getUserId())){ + queryWrapper.eq(CartInfo::getUserId, cartInfo.getUserId()); + } + + if (ObjUtils.notNull(cartInfo.getNum())){ + queryWrapper.eq(CartInfo::getNum, cartInfo.getNum()); + } + + if (ObjUtils.notNull(cartInfo.getIsSelected())){ + queryWrapper.eq(CartInfo::getIsSelected, cartInfo.getIsSelected()); + } + return list(queryWrapper); + } + + /** + * 添加购物车 + * @param cartInfo 购物车 + * @return + */ + @Override + public boolean add(CartInfo cartInfo) { +// Long userId = SecurityUtils.getUserId(); +// CartHashKey cartHashKey = CartHashKey.builder() +// .projectId(cartInfo.getProjectId()) +// .projectSku(cartInfo.getProjectSku()) +// .build(); +// SkuStocKey skuStocKey = SkuStocKey.builder() +// .projectId(cartInfo.getProjectId()) +// .sku(cartInfo.getProjectSku()) +// .build(); +// +// Long skuStock = Convert.toLong(projectSkuStockCache.get(skuStocKey), -1L); +// +// if (cartCache.hasKey(userId, cartHashKey)){ +// //取出来修改 +// CartInfo cartInfoCache = cartCache.get(userId, cartHashKey); +// cartInfoCache.setNum(cartInfoCache.getNum()+cartInfo.getNum()); +// if (skuStock < cartInfoCache.getNum()){ +// throw new ServiceException("当前库存不足"); +// } +// LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); +// updateWrapper.set(CartInfo::getNum,cartInfoCache.getNum()); +// updateWrapper.eq(CartInfo::getId, cartInfoCache.getId()); +// this.update(updateWrapper); +// this.cartCache.put(userId,cartHashKey,cartInfoCache); +// }else { +// //存进去 +// if (skuStock < cartInfo.getNum()){ +// throw new ServiceException("当前库存不足"); +// } +// cartInfo.setIsSelected("Y"); +// cartInfo.setUserId(userId); +// cartInfo.setCreateBy(SystemUtils.getUserName()); +// cartInfo.setCreateTime(new Date()); +// this.save(cartInfo); +// this.cartCache.put(userId,cartHashKey,cartInfo); +// } + return true; + } + + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/sourcedata/CartDataImpl.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/sourcedata/CartDataImpl.java new file mode 100644 index 0000000..1ea36cc --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/sourcedata/CartDataImpl.java @@ -0,0 +1,55 @@ +package com.muyu.shop.cart.service.sourcedata; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.shop.cart.cache.key.CartHashKey; +import com.muyu.shop.cart.cache.sourcedata.CartData; +import com.muyu.shop.cart.domain.CartInfo; +import com.muyu.shop.cart.service.CartInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 缓存实现 CartDataImpl + * + * @author LeYang + * on 2024/4/2 + */ +@Service +public class CartDataImpl implements CartData { + @Autowired + private CartInfoService cartInfoService; + + /** + * 通过键获取所有的hash的数据 + * @param key 键 + * @return + */ + @Override + public Map getData(Long key) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CartInfo::getUserId, key); + List list = cartInfoService.list(queryWrapper); + + return list.stream() + .collect(Collectors.toMap(cartInfo -> CartHashKey.builder().projectId(cartInfo.getProjectId()).projectSku(cartInfo.getProjectSku()).build(), cartInfo -> cartInfo)); + } + + /** + * 通过缓存键和hash键获取hash值 + * @param key 缓存键 + * @param cartHashKey hash值 + * @return hash值 + */ + @Override + public CartInfo getData(Long key, CartHashKey cartHashKey) { + LambdaQueryWrapper cartInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + cartInfoLambdaQueryWrapper.eq(CartInfo::getUserId,key); + cartInfoLambdaQueryWrapper.eq(CartInfo::getProjectId,cartHashKey.getProjectId()); + cartInfoLambdaQueryWrapper.eq(CartInfo::getProjectSku,cartHashKey.getProjectSku()); + return cartInfoService.getOne(cartInfoLambdaQueryWrapper); + } +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml index 544b1a2..e093664 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: # Spring spring: + main: + allow-circular-references: true application: # 应用名称 name: muyu-shop-cart diff --git a/muyu-modules/muyu-shop-cart/pom.xml b/muyu-modules/muyu-shop-cart/pom.xml index d944d40..1751c94 100644 --- a/muyu-modules/muyu-shop-cart/pom.xml +++ b/muyu-modules/muyu-shop-cart/pom.xml @@ -13,6 +13,7 @@ pom muyu-shop-cart-common + muyu-shop-cart-cache muyu-shop-cart-remote muyu-shop-cart-server diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java index 69294b6..681ca71 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java @@ -11,7 +11,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 授权角色返回结果集 * @Date 2023-6-19 下午 02:50 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java index cd72807..a3f9d21 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java @@ -10,7 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 部门树返回结果集 * @Date 2023-6-19 下午 02:52 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java index 21d9808..d91bec0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @author DongZl + * @author yangle * @description: 个人信息模型对象 * @Date 2023-6-19 下午 02:05 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java index 696763e..0a26807 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java @@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 角色返回菜单树 * @Date 2023-6-19 下午 02:40 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java index 4c61832..6d28b10 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java @@ -10,7 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 用户详细信息 * @Date 2023-6-19 下午 02:45 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java index d15a760..bf8b0f8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java @@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.Set; /** - * @author DongZl + * @author yangle * @description: 用户信息结果集 * @Date 2023-6-19 下午 02:42 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java index ced239a..e55a52f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysConfig; /** - * @author DongZl + * @author yangle * @description: 配置mybatis配置 * @Date 2023-11-13 上午 10:05 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java index f23d67e..7c8e354 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -6,7 +6,7 @@ import com.muyu.system.domain.SysConfig; import java.util.List; /** - * @author DongZl + * @author yangle * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index bc07cc8..cb6e9ef 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Objects; /** - * @author DongZl + * @author yangle * @description: 配置plus业务实现层 * @Date 2023-11-13 上午 10:06 */ diff --git a/pom.xml b/pom.xml index e4eda55..818b6c1 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,13 @@ ${muyu.version} + + + com.muyu + muyu-shop-cart-cache + ${muyu.version} + +