teaching
/
2204a-cloud-server
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

哈哈哈哈哈周六啦

1127/gaoxueci
gao 2024-11-30 10:57:31 +08:00
parent c6ece2c701
commit d5f46c781b
28 changed files with 135 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/策略-功能划分 100644
View File

@ -0,0 +1,17 @@
商品列表 -点击购买 （回显商品详情）
普通
百人
团长免单：
开团-（添加订单的页面 支付）
开团成功 - （添加订单信息 判断当前人数是否已满）(回显订单信息) 还差x人 邀请好友参团 剩余xx时间
邀请好友/有人参团 - （添加订单信息 判断当前人数是否已满）
满员 - （团长支付的钱返还至小钱包） （申请解冻-判断团内订单是否都已完成）
时间到达但是未邀满 免单失败 但原订单依然生效 可选择继续开团/参团
商品详情
团购订单列表

6
muyu-auth/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

9
muyu-gateway/src/main/resources/bootstrap.yml
View File

@ -1,7 +1,6 @@
# Tomcat
server:
port: 8080
# Spring
spring:
application:
@ -14,10 +13,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置
@ -33,7 +34,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
dataId: sentinel-muyu-gateway
groupId: DEFAULT_GROUP
data-type: json

6
muyu-modules/muyu-file/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

6
muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

6
muyu-modules/muyu-job/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

6
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java
View File

@ -10,9 +10,9 @@ import java.util.Date;
import java.util.List;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamProductInfoUpdModel {
/**
* 活动ID
@ -56,9 +56,9 @@ public class ActivityTeamProductInfoUpdModel {
*/
private String strategyType;
/**
* 商品SkU集合
* 商品SkU模型
*/
public List<ActivityTeamUpdSKuModel> updSkuList;
public ActivityTeamUpdSKuModel updSkuList;
/**
* 活动详情
*/

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java
View File

@ -8,9 +8,9 @@ import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ActivityTeamUpdSKuModel {
/**
* 商品规格修改集合

1
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java
View File

@ -2,7 +2,6 @@ package com.muyu.marketing.domain.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
View File

@ -3,6 +3,7 @@ package com.muyu.marketing;
import com.muyu.common.security.annotation.EnableCustomConfig;
import com.muyu.common.security.annotation.EnableMyFeignClients;
import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@EnableCustomSwagger2
@EnableMyFeignClients
@SpringBootApplication
@MapperScan("com.muyu.marketing.team.mapper")
public class MuYuMarketIngApplication {
public static void main (String[] args) {
SpringApplication.run(MuYuMarketIngApplication.class, args);

6
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
View File

@ -59,10 +59,16 @@ public class ActivityTeamController {
return Result.success();
}
/**
* 回显
* @param id
* @return
*/
@PostMapping("/findById/{id}")
public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
}
@PutMapping("/updateByTeamId")
public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));

3
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
View File

@ -47,10 +47,11 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
public boolean delByIds(List<Long> id);
public boolean add (List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList);
public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModels);
}

47
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
View File

@ -35,10 +35,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getKeyWord()), ActivityTeamInfo::getName, activityTeamInfoListQueryModel.getKeyWord());
queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoListQueryModel.getStatus()), ActivityTeamInfo::getStatus, activityTeamInfoListQueryModel.getStatus());
/**
* Object<T> -> 创建对象的时候进行的占用
* <T> Result<T> 以方法返回值为占用
*/
Page<ActivityTeamInfo> activityTeamInfoPage = this.page(activityTeamInfoListQueryModel.buildPage(), queryWrapper);
List<ActivityTeamInfo> activityTeamInfoList = activityTeamInfoPage.getRecords();
List<ActivityTeamInfoListModel> activityTeamInfoListModels = activityTeamInfoList.stream()
@ -108,28 +104,33 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
@Override
public boolean update(ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel) {
//转换为商品信息
ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.updateBuild(activityTeamProductInfoUpdModel);
//修改商品信息
this.updateById(activityTeamInfo);
this.updateById(ActivityTeamInfo.updateBuild(activityTeamProductInfoUpdModel));
//修改商品sku信息
activityTeamProductInfoUpdModel.getUpdSkuList()
.stream()
.forEach(activityTeamUpdSKuModel -> {
List<ActivityTeamProductSkuAddModel> addSkuList = activityTeamUpdSKuModel.getAddSkuList();
List<ActivityTeamProductSkuReqModel> skuList = activityTeamUpdSKuModel.getSkuList();
List<Long> delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList();
if (addSkuList != null){
activityTeamProductSkuInfoService.add(addSkuList);
}
if (skuList != null){
activityTeamProductSkuInfoService.updateBath(skuList);
}
if (delSkuIdList != null){
activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList);
}
});
activityTeamProductSkuInfoService.BathSku(activityTeamProductInfoUpdModel.getUpdSkuList());
return true;
}
// activityTeamProductInfoUpdModel.getUpdSkuList().stream().forEach(activityTeamUpdSKuModel -> {
// //存入id
// activityTeamUpdSKuModel.getAddSkuList().stream().forEach(add->{
// add.setTeamId(activityTeamProductInfoUpdModel.getTeamId());
// add.setProductId(activityTeamProductInfoUpdModel.getProductId());
// });
// //非空校验 业务操作
// List<ActivityTeamProductSkuAddModel> addSkuList = activityTeamUpdSKuModel.getAddSkuList();
// Assert.notNull(addSkuList, "添加的SKU列表不能为空");
// activityTeamProductSkuInfoService.add(addSkuList);
//
// List<ActivityTeamProductSkuReqModel> skuList = activityTeamUpdSKuModel.getSkuList();
// Assert.notNull(skuList, "skuList 不能为空");
// activityTeamProductSkuInfoService.updateBath(skuList);
//
// List<Long> delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList();
// Assert.notNull(delSkuIdList, "delSkuIdList 不能为空");
// activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList);
// });
}

22
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.muyu.product.domain.ProjectSkuInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.List;
import java.util.Optional;
@ -35,7 +36,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
// 优惠模型集合
Optional<TeamProductDiscountPriceModel> discountPriceModelOptional = teamProductSkuInfoList.stream()
.map(activityTeamProductSkuInfo -> {
ProjectSkuInfo projectSkuInfo = projectSkuCache.get(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
ProjectSkuInfo projectSkuInfo = projectSkuCache.getData(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice());
}).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue());
@ -89,25 +90,42 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
}
@Transactional
@Override
public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
if (null != activityTeamProductSkuReqModelList) {
return this.updateBatchById(activityTeamProductSkuReqModelList
.stream()
.map(ActivityTeamProductSkuInfo::updateModelBuild)
.toList());
}
return true;
}
@Override
public boolean delByIds(List<Long> id) {
if (null != id) {
return this.removeBatchByIds(id);
}
return true;
}
@Override
public boolean add(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList) {
if (null != activityTeamProductSkuReqModelList){
return this.saveBatch(activityTeamProductSkuReqModelList
.stream()
.map(ActivityTeamProductSkuInfo::modelBuild)
.toList());
}
return true;
}
@Transactional
@Override
public boolean BathSku(ActivityTeamUpdSKuModel activityTeamUpdSKuModel){
updateBath(activityTeamUpdSKuModel.getSkuList());
delByIds(activityTeamUpdSKuModel.getDelSkuIdList());
add(activityTeamUpdSKuModel.getAddSkuList());
return true;
}
}

9
muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
View File

@ -1,12 +1,11 @@
# Tomcat
server:
port: 9209
# Spring
spring:
application:
# 应用名称
name: muyu-buy
name: muyu-marketing
profiles:
# 环境配置
active: dev
@ -14,10 +13,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

1
muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectInfoDataRemoteImpl.java vendored
View File

@ -1,5 +1,6 @@
package com.muyu.product.cache.datasource.impl;
import com.muyu.common.core.domain.Result;
import com.muyu.product.cache.datasource.ProjectInfoData;
import com.muyu.product.domain.ProjectInfo;
import com.muyu.product.remote.RemoteProjectInfoService;

1
muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java vendored
View File

@ -1,5 +1,6 @@
package com.muyu.product.cache.datasource.impl;
import com.muyu.common.core.domain.Result;
import com.muyu.product.cache.datasource.ProjectSkuData;
import com.muyu.product.domain.ProjectSkuInfo;
import com.muyu.product.remote.RemoteProjectSkuService;

1
muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuStockDataRemoteImpl.java vendored
View File

@ -1,5 +1,6 @@
package com.muyu.product.cache.datasource.impl;
import com.muyu.common.core.domain.Result;
import com.muyu.product.cache.datasource.ProjectSkuStockData;
import com.muyu.product.cache.key.SkuStockKey;
import com.muyu.product.domain.ProjectSkuInfo;

1
muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/RuleCacheDataRemoteImpl.java vendored
View File

@ -1,5 +1,6 @@
package com.muyu.product.cache.datasource.impl;
import com.muyu.common.core.domain.Result;
import com.muyu.product.cache.datasource.RuleCacheData;
import com.muyu.product.cache.model.RuleAttrCacheModel;
import com.muyu.product.cache.model.RuleCacheModel;

1
muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java
View File

@ -1,5 +1,6 @@
package com.muyu.product.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.product.domain.ProjectInfo;
import com.muyu.product.remote.RemoteProjectInfoService;
import org.springframework.cloud.openfeign.FallbackFactory;

1
muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java
View File

@ -1,5 +1,6 @@
package com.muyu.product.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.product.domain.ProjectSkuInfo;
import com.muyu.product.remote.RemoteProjectSkuService;
import org.springframework.cloud.openfeign.FallbackFactory;

1
muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java
View File

@ -1,5 +1,6 @@
package com.muyu.product.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.product.domain.RuleInfo;
import com.muyu.product.remote.RemoteRuleService;
import org.springframework.cloud.openfeign.FallbackFactory;

6
muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

1
muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java vendored
View File

@ -1,6 +1,7 @@
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;

1
muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java
View File

@ -3,6 +3,7 @@ package com.muyu.shop.cart.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.muyu.common.core.domain.Result;
import com.muyu.shop.cart.domain.req.*;
import com.muyu.shop.cart.domain.resp.CartDetailResp;
import io.swagger.annotations.*;

6
muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
View File

@ -16,10 +16,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

6
muyu-modules/muyu-system/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置

6
muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
config:
# 配置中心地址
server-addr: 120.46.147.226:8848
server-addr: 113.44.75.158:8848
namespace: gxc-muyu
# 配置文件格式
file-extension: yml
# 共享配置