RH
/
2204-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

初始化-提交12.02

master
rh 2024-12-02 20:44:48 +08:00
parent 1f1da077cf
commit 10d4db2163
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 127.0.0.1:8848
server-addr: 60.204.152.212:8848
dataId: sentinel-muyu-gateway
groupId: DEFAULT_GROUP
data-type: json

3
muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamInfoServiceImpl.java
View File

@ -35,7 +35,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
ActivityTeamInfo::getName,
activityTeamInfoQueryModel.getKeyWord()
);
queryWrapper.like(StringUtils.isNotEmpty(activityTeamInfoQueryModel.getStatus()),
queryWrapper.like(StringUtils.isNotEmpty(
activityTeamInfoQueryModel.getStatus()),
ActivityTeamInfo::getStatus,
activityTeamInfoQueryModel.getStatus()
);

2
muyu-modules/muyu-actives/active-server/src/main/java/com/muyu/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
View File

@ -1,5 +1,4 @@
package com.muyu.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.active.domain.ActivityTeamProductSkuInfo;
@ -13,7 +12,6 @@ import com.muyu.service.ActivityTeamProductSkuInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;

1
muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/TemplateAttributeGroupModel.java
View File

@ -37,7 +37,6 @@ public class TemplateAttributeGroupModel extends BaseEntity {
/**
* 是否有效
* @return
*/
public boolean isEffective(){
return StringUtils.isNotEmpty(groupName) && attributeList != null && !attributeList.isEmpty();

1
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
View File

@ -118,6 +118,7 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
queryWrapper.eq(AsAttributeGroup::getGroupId, id);
List<AsAttributeGroup> asAttributeGroupList = asAttributeGroupService.list(queryWrapper);
List<Long> attributeIdList = asAttributeGroupList.stream()
.map(AsAttributeGroup::getAttributeId)
.toList();

9
muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/service/impl/CartInfoServiceImpl.java
View File

@ -73,27 +73,21 @@ public class CartInfoServiceImpl extends ServiceImpl<CartInfoMapper, CartInfo>
public List<CartInfo> list(CartInfo cartInfo) {
LambdaQueryWrapper<CartInfo> 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())){
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);
}
@ -145,7 +139,6 @@ public class CartInfoServiceImpl extends ServiceImpl<CartInfoMapper, CartInfo>
/**
* 获取购物车详情
*
* @return 购物车详情
*/
@Override