Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
YunaiV
3 years ago
commit
d982a95fdd
@ -0,0 +1,3 @@
|
||||
ALTER TABLE `ruoyi-vue-pro`.`trade_after_sale_log`
|
||||
ADD COLUMN `before_status` int NOT NULL COMMENT '售前状态' AFTER `id`,
|
||||
ADD COLUMN `after_status` int NOT NULL COMMENT '售后状态' AFTER `before_status`;
|
||||
@ -0,0 +1,51 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
|
||||
import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
|
||||
import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
|
||||
import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderBaseVO;
|
||||
import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderItemBaseVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "管理后台 - 售后订单的详情 Response VO")
|
||||
@Data
|
||||
public class TradeAfterSaleDetailRespVO extends TradeAfterSaleBaseVO {
|
||||
|
||||
@Schema(description = "售后编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 订单项列表
|
||||
*/
|
||||
private List<Item> items;
|
||||
|
||||
/**
|
||||
* 订单基本信息
|
||||
*/
|
||||
private TradeOrderBaseVO order;
|
||||
|
||||
/**
|
||||
* 用户信息
|
||||
*/
|
||||
private MemberUserRespVO user;
|
||||
|
||||
/**
|
||||
* 售后日志
|
||||
*/
|
||||
private List<TradeAfterSaleLogRespVO> afterSaleLog;
|
||||
|
||||
@Schema(description = "管理后台 - 交易订单的详情的订单项目")
|
||||
@Data
|
||||
public static class Item extends TradeOrderItemBaseVO {
|
||||
|
||||
/**
|
||||
* 属性数组
|
||||
*/
|
||||
private List<ProductPropertyValueDetailRespVO> properties;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
package cn.iocoder.yudao.module.trade.dal.mysql.cart;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.trade.dal.dataobject.cart.CartDO;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@Mapper
|
||||
public interface CartMapper extends BaseMapperX<CartDO> {
|
||||
|
||||
default CartDO selectByUserIdAndSkuId(Long userId, Long skuId) {
|
||||
return selectOne(CartDO::getUserId, userId,
|
||||
CartDO::getSkuId, skuId);
|
||||
}
|
||||
|
||||
default Integer selectSumByUserId(Long userId) {
|
||||
// SQL sum 查询
|
||||
List<Map<String, Object>> result = selectMaps(new QueryWrapper<CartDO>()
|
||||
.select("SUM(count) AS sumCount")
|
||||
.eq("user_id", userId)
|
||||
.eq("selected", true)); // 只计算选中的
|
||||
// 获得数量
|
||||
return CollUtil.getFirst(result) != null ? MapUtil.getInt(result.get(0), "sumCount") : 0;
|
||||
}
|
||||
|
||||
default CartDO selectById(Long id, Long userId) {
|
||||
return selectOne(CartDO::getId, id,
|
||||
CartDO::getUserId, userId);
|
||||
}
|
||||
|
||||
default List<CartDO> selectListByIds(Collection<Long> ids, Long userId) {
|
||||
return selectList(new LambdaQueryWrapper<CartDO>()
|
||||
.in(CartDO::getId, ids)
|
||||
.eq(CartDO::getUserId, userId));
|
||||
}
|
||||
|
||||
default List<CartDO> selectListByUserId(Long userId) {
|
||||
return selectList(new LambdaQueryWrapper<CartDO>()
|
||||
.eq(CartDO::getUserId, userId));
|
||||
}
|
||||
|
||||
default List<CartDO> selectListByUserId(Long userId, Set<Long> ids) {
|
||||
return selectList(new LambdaQueryWrapper<CartDO>()
|
||||
.eq(CartDO::getUserId, userId)
|
||||
.in(CartDO::getId, ids));
|
||||
}
|
||||
|
||||
default void updateByIds(Collection<Long> ids, Long userId, CartDO updateObj) {
|
||||
update(updateObj, new LambdaQueryWrapper<CartDO>()
|
||||
.in(CartDO::getId, ids)
|
||||
.eq(CartDO::getUserId, userId));
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,80 +0,0 @@
|
||||
package cn.iocoder.yudao.module.trade.dal.mysql.cart;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.trade.dal.dataobject.cart.TradeCartDO;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@Mapper
|
||||
public interface TradeCartMapper extends BaseMapperX<TradeCartDO> {
|
||||
|
||||
default TradeCartDO selectByUserIdAndSkuId(Long userId, Long skuId,
|
||||
Boolean addStatus, Boolean orderStatus) {
|
||||
return selectOne(new LambdaQueryWrapper<TradeCartDO>().eq(TradeCartDO::getUserId, userId)
|
||||
.eq(TradeCartDO::getSkuId, skuId)
|
||||
.eq(TradeCartDO::getAddStatus, addStatus)
|
||||
.eq(TradeCartDO::getOrderStatus, orderStatus));
|
||||
}
|
||||
|
||||
default Integer selectSumByUserId(Long userId) {
|
||||
// SQL sum 查询
|
||||
List<Map<String, Object>> result = selectMaps(new QueryWrapper<TradeCartDO>()
|
||||
.select("SUM(count) AS sumCount")
|
||||
.eq("user_id", userId)
|
||||
.eq("add_status", true) // 只计算添加到购物车中的
|
||||
.eq("order_status", false)); // 必须未下单
|
||||
// 获得数量
|
||||
return CollUtil.getFirst(result) != null ? MapUtil.getInt(result.get(0), "sumCount") : 0;
|
||||
}
|
||||
|
||||
default Map<Long, Integer> selectSumMapByUserId(Long userId) {
|
||||
// SQL sum 查询
|
||||
List<Map<String, Object>> result = selectMaps(new QueryWrapper<TradeCartDO>()
|
||||
.select("spu_id, SUM(count) AS sumCount")
|
||||
.eq("user_id", userId)
|
||||
.eq("add_status", true) // 只计算添加到购物车中的
|
||||
.eq("order_status", false) // 必须未下单
|
||||
.groupBy("spu_id"));
|
||||
// 获得数量
|
||||
return CollectionUtils.convertMap(result, item -> MapUtil.getLong(item, "spu_id"),
|
||||
item -> MapUtil.getInt(item, "sumCount"));
|
||||
}
|
||||
|
||||
default TradeCartDO selectById(Long id, Long userId) {
|
||||
return selectOne(TradeCartDO::getId, id,
|
||||
TradeCartDO::getUserId, userId);
|
||||
}
|
||||
|
||||
default List<TradeCartDO> selectListByIds(Collection<Long> ids, Long userId) {
|
||||
return selectList(new LambdaQueryWrapper<TradeCartDO>()
|
||||
.in(TradeCartDO::getId, ids)
|
||||
.eq(TradeCartDO::getUserId, userId));
|
||||
}
|
||||
|
||||
default List<TradeCartDO> selectListByUserId(Long userId, Boolean addStatus, Boolean orderStatus) {
|
||||
return selectList(new LambdaQueryWrapper<TradeCartDO>()
|
||||
.eq(TradeCartDO::getUserId, userId)
|
||||
.eq(TradeCartDO::getAddStatus, addStatus)
|
||||
.eq(TradeCartDO::getOrderStatus, orderStatus));
|
||||
}
|
||||
|
||||
default void updateByIds(Collection<Long> ids, TradeCartDO updateObject) {
|
||||
update(updateObject, new LambdaQueryWrapper<TradeCartDO>().in(TradeCartDO::getId, ids));
|
||||
}
|
||||
|
||||
default List<TradeCartDO> selectListByUserId(Long userId, Set<Long> ids) {
|
||||
return selectList(new LambdaQueryWrapper<TradeCartDO>()
|
||||
.eq(TradeCartDO::getUserId, userId)
|
||||
.in(TradeCartDO::getId, ids));
|
||||
}
|
||||
|
||||
}
|
||||
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java
2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java → yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java
@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
|
||||
package cn.iocoder.yudao.module.member.controller.admin.level.vo.record;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@ -0,0 +1,43 @@
|
||||
package cn.iocoder.yudao.module.member.controller.app.level;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
|
||||
import cn.iocoder.yudao.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO;
|
||||
import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
|
||||
import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
|
||||
import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
||||
|
||||
@Tag(name = "用户 App - 会员经验记录")
|
||||
@RestController
|
||||
@RequestMapping("/member/experience-record")
|
||||
@Validated
|
||||
public class AppMemberExperienceRecordController {
|
||||
|
||||
@Resource
|
||||
private MemberExperienceRecordService experienceLogService;
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得会员经验记录分页")
|
||||
@PreAuthenticated
|
||||
public CommonResult<PageResult<AppMemberExperienceRecordRespVO>> getExperienceRecordPage(
|
||||
@Valid PageParam pageParam) {
|
||||
PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(
|
||||
getLoginUserId(), pageParam);
|
||||
return success(MemberExperienceRecordConvert.INSTANCE.convertPage02(pageResult));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.iocoder.yudao.module.member.controller.app.level;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.module.member.controller.app.level.vo.level.AppMemberLevelRespVO;
|
||||
import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
|
||||
import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
|
||||
import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "用户 App - 会员等级")
|
||||
@RestController
|
||||
@RequestMapping("/member/level")
|
||||
@Validated
|
||||
public class AppMemberLevelController {
|
||||
|
||||
@Resource
|
||||
private MemberLevelService levelService;
|
||||
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "获得会员等级列表")
|
||||
public CommonResult<List<AppMemberLevelRespVO>> getLevelList() {
|
||||
List<MemberLevelDO> result = levelService.getEnableLevelList();
|
||||
return success(MemberLevelConvert.INSTANCE.convertList02(result));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package cn.iocoder.yudao.module.member.controller.app.level.vo.experience;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "用户 App - 会员经验记录 Response VO")
|
||||
@Data
|
||||
public class AppMemberExperienceRecordRespVO {
|
||||
|
||||
@Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
|
||||
private Integer experience;
|
||||
|
||||
@Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.iocoder.yudao.module.member.controller.app.level.vo.level;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "用户 App - 会员等级 Response VO")
|
||||
@Data
|
||||
public class AppMemberLevelRespVO {
|
||||
|
||||
@Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Integer level;
|
||||
|
||||
@Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
|
||||
private Integer experience;
|
||||
|
||||
@Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
|
||||
private Integer discountPercent;
|
||||
|
||||
@Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
|
||||
private String icon;
|
||||
|
||||
@Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg")
|
||||
private String backgroundUrl;
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package cn.iocoder.yudao.module.pay.enums.member;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 钱包明细查询类型
|
||||
*
|
||||
* @author jason
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public enum WalletTransactionQueryTypeEnum implements IntArrayValuable {
|
||||
RECHARGE(1, "充值"),
|
||||
EXPENSE(2, "消费");
|
||||
|
||||
private final Integer type;
|
||||
|
||||
private final String desc;
|
||||
|
||||
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(WalletTransactionQueryTypeEnum::getType).toArray();
|
||||
|
||||
@Override
|
||||
public int[] array() {
|
||||
return ARRAYS;
|
||||
}
|
||||
|
||||
public static WalletTransactionQueryTypeEnum valueOf(Integer type) {
|
||||
return ArrayUtil.firstMatch(o -> o.getType().equals(type), values());
|
||||
}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package cn.iocoder.yudao.module.pay.controller.app.wallet.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.validation.InEnum;
|
||||
import cn.iocoder.yudao.module.pay.enums.member.WalletTransactionQueryTypeEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "用户 APP - 钱包余额明细分页 Request VO")
|
||||
@Data
|
||||
public class AppPayWalletTransactionPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "余额明细查询分类", example = "1")
|
||||
@InEnum(value = WalletTransactionQueryTypeEnum.class, message = "查询类型必须是 {value}")
|
||||
private Integer type;
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.iocoder.yudao.module.pay.controller.app.wallet.vo.transaction;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "用户 APP - 钱包流水分页 Request VO")
|
||||
@Data
|
||||
public class AppPayWalletTransactionPageReqVO extends PageParam {
|
||||
|
||||
/**
|
||||
* 类型 - 收入
|
||||
*/
|
||||
public static final Integer TYPE_INCOME = 1;
|
||||
/**
|
||||
* 类型 - 支出
|
||||
*/
|
||||
public static final Integer TYPE_EXPENSE = 2;
|
||||
|
||||
@Schema(description = "类型", example = "1")
|
||||
private Integer type;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue