首次提交

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spuapply/vo/SpuApplySaveReqVO.java

@@ -35,6 +35,9 @@ public class SpuApplySaveReqVO {
     @Schema(description = "商品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1734")
     private Long categoryId;
 
+    @Schema(description = "商品分区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long areaId;
+
     @Schema(description = "商品品牌编号", example = "4607")
     private Integer brandId;
 
@@ -71,12 +74,6 @@ public class SpuApplySaveReqVO {
     @Schema(description = "物流配置模板编号", example = "3169")
     private Long deliveryTemplateId;
 
-    @Schema(description = "赠送积分", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer giveIntegral;
-
-    @Schema(description = "分销类型", example = "1")
-    private Boolean subCommissionType;
-
     @Schema(description = "商品销量", example = "231")
     private Integer salesCount;
 
@@ -98,15 +95,6 @@ public class SpuApplySaveReqVO {
     @Schema(description = "推广费, 单位: 分，值为sku中最大的推广费")
     private Integer promotionFee;
 
-    @Schema(description = "商品支付类别(1 rmb 2积分)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer spuPayType;
-
-    @Schema(description = "高精度", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Boolean highPrecision;
-
-    @Schema(description = "高精度价格", example = "23692")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "申请用户id", example = "22602")
     private Long applyMemberUserId;
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderDetailRespVO.java

@@ -33,43 +33,6 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO {
 
 
 
-    /* *
-
-    *//**
-     * 订单图片- 商品图片
-     *//*
-    private String goodUrl;
-    *//**
-     * 配送类型
-     *//*
-    private String  deliveryType;
-    *//**
-     * 运费
-     *//*
-    private String  deliveryPrice;
-    *//**
-     * 发货公司
-     *//*
-    private String logisticsName;
-
-
-    *//**
-     * 售后信息
-     *//*
-    private AfterSaleBaseVO afterSaleBaseVO;
-
-    *//**
-     * 评价信息
-     *//*
-    private ProductCommentCreateReqDTO productCommentCreateReqDTO;
-
-    *//**
-     * 物流信息
-     *//*
-
-
-
-
     /**
      * 操作日志列表
      */

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -2,10 +2,7 @@ package cn.newfeifan.mall.module.trade.dal.dataobject.order;
 
 import cn.newfeifan.mall.framework.common.enums.TerminalEnum;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
-import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import cn.newfeifan.mall.module.trade.enums.delivery.DeliveryTypeEnum;
 import cn.newfeifan.mall.module.trade.enums.order.TradeOrderCancelTypeEnum;
 import cn.newfeifan.mall.module.trade.enums.order.TradeOrderRefundStatusEnum;
@@ -80,6 +77,10 @@ public class TradeOrderDO extends BaseDO {
      * 枚举 {@link TradeOrderStatusEnum}
      */
     private Integer status;
+    /**
+     * 使用积分类型
+     */
+    private Integer integralType;
     /**
      * 购买的商品数量
      */
@@ -110,25 +111,12 @@ public class TradeOrderDO extends BaseDO {
      */
     private Boolean commentStatus;
 
-    /**
-     * 推广人编号
-     * <p>
-     * 关联 {@link BrokerageUserDO#getId()} 字段，即 {@link MemberUserRespDTO#getId()} 字段
-     */
-    private Long brokerageUserId;
-
     // ========== 价格 + 支付基本信息 ==========
 
     // 价格文档 - 淘宝：https://open.taobao.com/docV3.htm?docId=108471&docType=1
     // 价格文档 - 京东到家：https://openo2o.jddj.com/api/getApiDetail/182/4d1494c5e7ac4679bfdaaed950c5bc7f.htm
     // 价格文档 - 有赞：https://doc.youzanyun.com/detail/API/0/906
 
-    /**
-     * 支付订单编号
-     * <p>
-     * 对接 pay-module-biz 支付服务的支付订单编号，即 PayOrderDO 的 id 编号
-     */
-    private Long payOrderId;
     /**
      * 是否已支付
      * <p>
@@ -140,12 +128,6 @@ public class TradeOrderDO extends BaseDO {
      * 付款时间
      */
     private LocalDateTime payTime;
-    /**
-     * 支付渠道
-     * <p>
-     * 对应 PayChannelEnum 枚举
-     */
-    private String payChannelCode;
 
     /**
      * 商品原价，单位：分
@@ -155,34 +137,10 @@ public class TradeOrderDO extends BaseDO {
      * 对应 taobao 的 trade.total_fee 字段
      */
     private Integer totalPrice;
-    /**
-     * 优惠金额，单位：分
-     * <p>
-     * 对应 taobao 的 order.discount_fee 字段
-     */
-    private Integer discountPrice;
     /**
      * 运费金额，单位：分
      */
     private Integer deliveryPrice;
-    /**
-     * 订单调价，单位：分
-     * <p>
-     * 正数，加价；负数，减价
-     */
-    private Integer adjustPrice;
-    /**
-     * 应付金额（总），单位：分
-     * <p>
-     * = {@link #totalPrice}
-     * - {@link #couponPrice}
-     * - {@link #pointPrice}
-     * - {@link #discountPrice}
-     * + {@link #deliveryPrice}
-     * + {@link #adjustPrice}
-     * - {@link #vipPrice}
-     */
-    private Integer payPrice;
 
     // ========== 收件 + 物流基本信息 ==========
     /**
@@ -231,17 +189,6 @@ public class TradeOrderDO extends BaseDO {
      */
     private String receiverDetailAddress;
 
-    /**
-     * 自提门店编号
-     * <p>
-     * 关联 {@link DeliveryPickUpStoreDO#getId()}
-     */
-    private Long pickUpStoreId;
-    /**
-     * 自提核销码
-     */
-    private String pickUpVerifyCode;
-
     // ========== 售后基本信息 ==========
     /**
      * 售后状态
@@ -249,87 +196,6 @@ public class TradeOrderDO extends BaseDO {
      * 枚举 {@link TradeOrderRefundStatusEnum}
      */
     private Integer refundStatus;
-    /**
-     * 退款金额，单位：分
-     * <p>
-     * 注意，退款并不会影响 {@link #payPrice} 实际支付金额
-     * 也就说，一个订单最终产生多少金额的收入 = payPrice - refundPrice
-     */
-    private Integer refundPrice;
-
-    // ========== 营销基本信息 ==========
-    /**
-     * 优惠劵编号
-     */
-    private Long couponId;
-    /**
-     * 优惠劵减免金额，单位：分
-     * <p>
-     * 对应 taobao 的 trade.coupon_fee 字段
-     */
-    private Integer couponPrice;
-    /**
-     * 使用的积分
-     */
-    private Integer usePoint;
-    /**
-     * 积分抵扣的金额，单位：分
-     * <p>
-     * 对应 taobao 的 trade.point_fee 字段
-     */
-    private Integer pointPrice;
-    /**
-     * 赠送的积分
-     */
-    private Integer givePoint;
-    /**
-     * 退还的使用的积分
-     */
-    private Integer refundPoint;
-    /**
-     * VIP 减免金额，单位：分
-     */
-    private Integer vipPrice;
-
-    /**
-     * 秒杀活动编号
-     * <p>
-     * 关联 SeckillActivityDO 的 id 字段
-     */
-    private Long seckillActivityId;
-
-    /**
-     * 砍价活动编号
-     * <p>
-     * 关联 BargainActivityDO 的 id 字段
-     */
-    private Long bargainActivityId;
-    /**
-     * 砍价记录编号
-     * <p>
-     * 关联 BargainRecordDO 的 id 字段
-     */
-    private Long bargainRecordId;
-
-    /**
-     * 拼团活动编号
-     * <p>
-     * 关联 CombinationActivityDO 的 id 字段
-     */
-    private Long combinationActivityId;
-    /**
-     * 拼团团长编号
-     * <p>
-     * 关联 CombinationRecordDO 的 headId 字段
-     */
-    private Long combinationHeadId;
-    /**
-     * 拼团记录编号
-     * <p>
-     * 关联 CombinationRecordDO 的 id 字段
-     */
-    private Long combinationRecordId;
-
 
     private Long shopId;
 
@@ -338,19 +204,10 @@ public class TradeOrderDO extends BaseDO {
      * 支付积分
      */
     private Long payIntegral;
-    /**
-     * 用户获得积分
-     */
-    private Long increaseIntegral;
     /**
      * 退还的使用的积分
      */
     private Long refundIntegral;
-    /**
-     * 实付人民币，单位：分
-     */
-    private Integer payRmb;
-
     /**
      * 订阅物流信息，未订阅是0，已订阅是1
      */
@@ -369,12 +226,4 @@ public class TradeOrderDO extends BaseDO {
      */
     private String attachment;
 
-    /**
-     * 支付消费分
-     */
-    private Long payConsumptionPoints;
-    /**
-     * 退还的使用的消费分
-     */
-    private Long refundConsumption;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -42,16 +42,13 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getDeliveryType, reqVO.getDeliveryType())
                 .inIfPresent(TradeOrderDO::getUserId, userIds)
                 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
-                .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())
                 .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
                 .eqIfPresent(TradeOrderDO::getMerchantId, reqVO.getMerchantId())
                 .eqIfPresent(TradeOrderDO::getShopId, reqVO.getShopId())
                 .inIfPresent(TradeOrderDO::getShopId, reqVO.getShopIds())
                 .inIfPresent(TradeOrderDO::getId, orderIds)
-                .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
                 .inIfPresent(TradeOrderDO::getPayStatus, reqVO.getPayStatus())
-                .likeIfPresent(TradeOrderDO::getPickUpVerifyCode, reqVO.getPickUpVerifyCode())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TradeOrderDO::getId);
         if(reqVO.getStatus() != null && reqVO.getStatus().equals(TradeOrderStatusEnum.AFTER_SALE.getStatus())){
@@ -72,18 +69,14 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
         return selectMaps(new MPJLambdaWrapperX<TradeOrderDO>()
                 .selectAs(TradeOrderDO::getRefundStatus, TradeOrderDO::getRefundStatus)  // 售后状态
                 .selectCount(TradeOrderDO::getId, "count") // 售后状态对应的数量
-                .selectSum(TradeOrderDO::getPayPrice, "price")  // 售后状态对应的支付金额
                 .likeIfPresent(TradeOrderDO::getNo, reqVO.getNo())
                 .eqIfPresent(TradeOrderDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(TradeOrderDO::getDeliveryType, reqVO.getDeliveryType())
                 .inIfPresent(TradeOrderDO::getUserId, userIds)
                 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
                 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())
                 .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
-                .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
-                .likeIfPresent(TradeOrderDO::getPickUpVerifyCode, reqVO.getPickUpVerifyCode())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .groupBy(TradeOrderDO::getRefundStatus)); // 按售后状态分组
     }
@@ -115,14 +108,11 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(TradeOrderDO::getDeliveryType, reqVO.getDeliveryType())
                 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
-                .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())
                 .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
                 .eqIfPresent(TradeOrderDO::getMerchantId, reqVO.getMerchantId())
                 .eqIfPresent(TradeOrderDO::getShopId,reqVO.getShopId())
                 .inIfPresent(TradeOrderDO::getShopId, reqVO.getShopIds())
-                .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
-                .likeIfPresent(TradeOrderDO::getPickUpVerifyCode, reqVO.getPickUpVerifyCode())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())
                 .ne(TradeOrderDO::getRefundStatus, TradeOrderRefundStatusEnum.ALL.getStatus())
         );
@@ -161,19 +151,13 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
 
     default List<TradeOrderDO> selectListByUserIdAndSeckillActivityId(Long userId, Long seckillActivityId) {
         return selectList(new LambdaUpdateWrapper<>(TradeOrderDO.class)
-                .eq(TradeOrderDO::getUserId, userId)
-                .eq(TradeOrderDO::getSeckillActivityId, seckillActivityId));
-    }
-
-    default TradeOrderDO selectOneByPickUpVerifyCode(String pickUpVerifyCode) {
-        return selectOne(TradeOrderDO::getPickUpVerifyCode, pickUpVerifyCode);
+                .eq(TradeOrderDO::getUserId, userId));
     }
 
     default TradeOrderDO selectByUserIdAndCombinationActivityIdAndStatus(Long userId, Long combinationActivityId, Integer status) {
         return selectOne(new LambdaQueryWrapperX<TradeOrderDO>()
                 .eq(TradeOrderDO::getUserId, userId)
                 .eq(TradeOrderDO::getStatus, status)
-                .eq(TradeOrderDO::getCombinationActivityId, combinationActivityId)
         );
     }
 
@@ -197,7 +181,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .likeIfPresent(TradeOrderDO::getNo, reqVO.getNo())
                 .eqIfPresent(TradeOrderDO::getDeliveryType, reqVO.getDeliveryType())
                 .eqIfPresent(TradeOrderDO::getType, reqVO.getType())
-                .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal, reqVO.getTerminal())
                 .eqIfPresent(TradeOrderDO::getMerchantId, reqVO.getMerchantId())
                 .eqIfPresent(TradeOrderDO::getShopId,reqVO.getShopId())

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/handler/TradeCouponOrderHandler.java

@@ -22,21 +22,10 @@ public class TradeCouponOrderHandler implements TradeOrderHandler {
 
     @Override
     public void afterOrderCreate(TradeOrderDO order, List<TradeOrderItemDO> orderItems) {
-        if (order.getCouponId() == null || order.getCouponId() <= 0) {
-            return;
-        }
-        // 不在前置扣减的原因，是因为优惠劵要记录使用的订单号
-        couponApi.useCoupon(new CouponUseReqDTO().setId(order.getCouponId()).setUserId(order.getUserId())
-                .setOrderId(order.getId()));
     }
 
     @Override
     public void afterCancelOrder(TradeOrderDO order, List<TradeOrderItemDO> orderItems) {
-        if (order.getCouponId() == null || order.getCouponId() <= 0) {
-            return;
-        }
-        // 退回优惠劵
-        couponApi.returnUsedCoupon(order.getCouponId());
     }
 
 }