Helius
2021-09-23 24b3557d1cf0658d4ce86f242eab5df539e786af
fix carts del goods
7 files added
2 files modified
141 ■■■■■ changed files
sql/xc_mall.sql 33 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallShoppingCartController.java 11 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/DelCartGoodsDto.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java 33 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefundOperation.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderRefundMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderRefundOperationMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderRefundMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderRefundOperationMapper.xml 5 ●●●●● patch | view | raw | blame | history
sql/xc_mall.sql
@@ -243,3 +243,36 @@
alter table mall_order_info add receiving_time datetime null comment '收货时间';
DROP TABLE IF EXISTS mall_order_refund;
CREATE TABLE mall_order_refund(
  REVISION INT    COMMENT '乐观锁' ,
  CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
  CREATED_TIME DATETIME    COMMENT '创建时间' ,
  UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
  UPDATED_TIME DATETIME    COMMENT '更新时间' ,
  ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
  member_id BIGINT    COMMENT '用户ID' ,
  order_id BIGINT    COMMENT '订单ID' ,
  reason VARCHAR(255)    COMMENT '退款原因' ,
  desp TEXT    COMMENT '描述' ,
  remark TEXT    COMMENT '备注' ,
  status INT    COMMENT '状态;1-已申请2-同意退款3-驳回退款4-已提交物流信息5-已退款' ,
  express_no VARCHAR(255)    COMMENT '物流单号' ,
  express_com VARCHAR(255)    COMMENT '物流公司' ,
  PRIMARY KEY (ID)
)  COMMENT = '订单退款';
DROP TABLE IF EXISTS mall_order_refund_operation;
CREATE TABLE mall_order_refund_operation(
    REVISION INT    COMMENT '乐观锁' ,
    CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
    CREATED_TIME DATETIME    COMMENT '创建时间' ,
    UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
    ID BIGINT NOT NULL AUTO_INCREMENT  COMMENT '主键' ,
    refund_id BIGINT    COMMENT '退款ID' ,
    order_id BIGINT    COMMENT '订单ID' ,
    content TEXT    COMMENT '操作内容' ,
    PRIMARY KEY (ID)
)  COMMENT = '退款操作明细';
src/main/java/cc/mrbird/febs/mall/controller/ApiMallShoppingCartController.java
@@ -2,8 +2,10 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.AddCartDto;
import cc.mrbird.febs.mall.dto.DelCartGoodsDto;
import cc.mrbird.febs.mall.service.IApiMallShoppingCartService;
import cc.mrbird.febs.mall.vo.ShoppingCartGoodsVo;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -12,6 +14,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * @author wzy
@@ -44,9 +48,10 @@
    }
    @ApiOperation(value = "从购物车中删除商品", notes = "从购物车中删除商品")
    @PostMapping(value = "/delGoods/{id}")
    public FebsResponse delGoods(@PathVariable("id") Long id) {
        mallShoppingCartService.removeById(id);
    @PostMapping(value = "/delGoods")
    public FebsResponse delGoods(@RequestBody DelCartGoodsDto delCartGoodsDto) {
        List<String> ids = StrUtil.split(delCartGoodsDto.getIds(), ',');
        mallShoppingCartService.removeByIds(ids);
        return new FebsResponse().success().data("删除成功");
    }
}
src/main/java/cc/mrbird/febs/mall/dto/DelCartGoodsDto.java
New file
@@ -0,0 +1,20 @@
package cc.mrbird.febs.mall.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
 * @author wzy
 * @date 2021-09-23
 **/
@Data
@ApiModel(value = "DelCartGoodsDto", description = "删除购物车商品接口接收参数类")
public class DelCartGoodsDto {
    @NotBlank(message = "参数不能为空")
    @ApiModelProperty(value = "逗号隔开id", example = "1,2,3")
    private String ids;
}
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
New file
@@ -0,0 +1,33 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
 * @author wzy
 * @date 2021-09-23
 **/
@Data
@TableName("mall_order_refund")
public class MallOrderRefund extends BaseEntity {
    private Long memberId;
    private Long orderId;
    private String reason;
    private String desp;
    private String remark;
    /**
     * 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款
     */
    private Integer status;
    private String expressNo;
    private String expressCom;
}
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefundOperation.java
New file
@@ -0,0 +1,20 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
 * @author wzy
 * @date 2021-09-23
 **/
@Data
@TableName("mall_order_refund_operation")
public class MallOrderRefundOperation extends BaseEntity {
    private Long refundId;
    private Long orderId;
    private String content;
}
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderRefundMapper.java
New file
@@ -0,0 +1,7 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface MallOrderRefundMapper extends BaseMapper<MallOrderRefund> {
}
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderRefundOperationMapper.java
New file
@@ -0,0 +1,7 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallOrderRefundOperation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface MallOrderRefundOperationMapper extends BaseMapper<MallOrderRefundOperation> {
}
src/main/resources/mapper/modules/MallOrderRefundMapper.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallOrderRefundMapper">
</mapper>
src/main/resources/mapper/modules/MallOrderRefundOperationMapper.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper">
</mapper>