首次提交

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

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import java.math.BigDecimal;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -36,6 +38,9 @@ public class SpuApplyPageReqVO extends PageParam {
     @Schema(description = "商品分类编号", example = "1734")
     private Long categoryId;
 
+    @Schema(description = "商品分区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long areaId;
+
     @Schema(description = "商品品牌编号", example = "4607")
     private Integer brandId;
 
@@ -72,12 +77,6 @@ public class SpuApplyPageReqVO extends PageParam {
     @Schema(description = "物流配置模板编号", example = "3169")
     private Long deliveryTemplateId;
 
-    @Schema(description = "赠送积分")
-    private Integer giveIntegral;
-
-    @Schema(description = "分销类型", example = "1")
-    private Boolean subCommissionType;
-
     @Schema(description = "商品销量", example = "231")
     private Integer salesCount;
 
@@ -103,15 +102,6 @@ public class SpuApplyPageReqVO extends PageParam {
     @Schema(description = "推广费, 单位: 分，值为sku中最大的推广费")
     private Integer promotionFee;
 
-    @Schema(description = "商品支付类别(1 rmb 2积分)", example = "1")
-    private Integer spuPayType;
-
-    @Schema(description = "高精度")
-    private Boolean highPrecision;
-
-    @Schema(description = "高精度价格", example = "23692")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "申请用户id", example = "22602")
     private Long applyMemberUserId;
 

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

@@ -12,6 +12,8 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
+import javax.validation.constraints.NotNull;
+
 @Schema(description = "管理后台 - 商品spu申请 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -41,6 +43,10 @@ public class SpuApplyRespVO {
     @ExcelProperty("商品分类编号")
     private Long categoryId;
 
+    @Schema(description = "商品分区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("商品分区编号")
+    private Long areaId;
+
     @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("商品品牌编号")
     private Long brandId;
@@ -99,16 +105,6 @@ public class SpuApplyRespVO {
     @ExcelProperty("物流配置模板编号")
     private Long deliveryTemplateId;
 
-    // ========== 营销相关字段 =========
-
-    @Schema(description = "赠送积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
-    @ExcelProperty("赠送积分")
-    private Integer giveIntegral;
-
-    @Schema(description = "分销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    @ExcelProperty("分销类型")
-    private Boolean subCommissionType;
-
     // ========== 统计相关字段 =========
 
     @Schema(description = "商品销量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
@@ -143,14 +139,6 @@ public class SpuApplyRespVO {
     @Schema(description = "推广费, 单位: 分，值为sku中最大的推广费")
     private Integer promotionFee;
 
-    @Schema(description = "高精度", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("高精度")
-    private Boolean highPrecision;
-
-    @Schema(description = "高精度价格", example = "9255")
-    @ExcelProperty("高精度价格")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "申请用户id", example = "22602")
     @ExcelProperty("申请用户id")
     private Long applyMemberUserId;

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

@@ -93,55 +93,10 @@ public class TradeOrderItemDO extends BaseDO {
      * 对应 taobao 的 order.price 字段
      */
     private Integer price;
-    /**
-     * 优惠金额（总），单位：分
-     * 对应 taobao 的 order.discount_fee 字段
-     */
-    private Integer discountPrice;
     /**
      * 运费金额（总），单位：分
      */
     private Integer deliveryPrice;
-    /**
-     * 订单调价（总），单位：分
-     * 正数，加价；负数，减价
-     */
-    private Integer adjustPrice;
-    /**
-     * 应付金额（总），单位：分
-     * = {@link #price} * {@link #count}
-     * - {@link #couponPrice}
-     * - {@link #pointPrice}
-     * - {@link #discountPrice}
-     * + {@link #deliveryPrice}
-     * + {@link #adjustPrice}
-     * - {@link #vipPrice}
-     */
-    private Integer payPrice;
-
-    // ========== 营销基本信息 ==========
-
-    /**
-     * 优惠劵减免金额，单位：分
-     * 对应 taobao 的 trade.coupon_fee 字段
-     */
-    private Integer couponPrice;
-    /*** 积分抵扣的金额，单位：分
-     * 对应 taobao 的 trade.point_fee 字段
-     */
-    private Integer pointPrice;
-    /*** 使用的积分
-     * 目的：用于后续取消或者售后订单时，需要归还赠送
-     */
-    private Integer usePoint;
-    /*** 赠送的积分
-     * 目的：用于后续取消或者售后订单时，需要扣减赠送
-     */
-    private Integer givePoint;
-    /**
-     * VIP 减免金额，单位：分
-     */
-    private Integer vipPrice;
 
     // ========== 售后基本信息 ==========
 
@@ -164,19 +119,11 @@ public class TradeOrderItemDO extends BaseDO {
       */
     private Long ancestorIncreaseIntegral;
 
-    //用户获得积分
-    private Long increaseIntegral;
-
     /**
      * 用户获得冻结最大可用额度
      */
     private Long freezeHighQuota;
 
-    /**
-     * 高精度价格
-     */
-    private BigDecimal highPrecisionPrice;
-
     /**
      * 推广费, 单位: 分
      */
@@ -187,14 +134,9 @@ public class TradeOrderItemDO extends BaseDO {
     private Integer costPrice;
 
     /**
-     * 支付消费分
+     * 支付积分
      */
-    private Long payConsumptionPoints;
-    /**
-     * 退还的使用的消费分
-     */
-    private Long refundConsumption;
-
+    private Long payIntegral;
 
     /**
      * 商品属性

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

@@ -328,7 +328,6 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
                         .orderId(k.getOrderId())
                         .count(k.getCount())
                         .orderItemId(k.getOrderItemId())
-                        .increaseIntegral(k.getIncreaseIntegral())
                         .ancestorIncreaseIntegral(k.getAncestorIncreaseIntegral())
                         .freezeHighQuota(k.getFreezeHighQuota())
                         .totalPrice(k.getTotalPrice()).build())
@@ -338,7 +337,6 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
             OrderCalcMessage orderCalcMessage = OrderCalcMessage.builder()
                     .orderId(k.getOrderId())
                     .name(k.getName())
-                    .nickName(k.getNickName())
                     .no(k.getNo())
                     .merchantId(k.getMerchantId())
                     .productCount(k.getProductCount())

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

@@ -122,20 +122,6 @@ public interface TradeOrderUpdateService {
      */
     void pickUpOrderByAdmin(Long id);
 
-    /**
-     * 【管理员】核销订单
-     *
-     * @param pickUpVerifyCode 自提核销码
-     */
-    void pickUpOrderByAdmin(String pickUpVerifyCode);
-
-    /**
-     * 【管理员】根据自提核销码，查询订单
-     *
-     * @param pickUpVerifyCode 自提核销码
-     */
-    TradeOrderDO getByPickUpVerifyCode(String pickUpVerifyCode);
-
     // =================== Order Item ===================
 
     /**