首次提交

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

@@ -63,14 +63,6 @@ public class SkuApplyRespVO {
     @ExcelProperty("商品体积，单位：m^3 平米")
     private Double volume;
 
-    @Schema(description = "一级分销的佣金，单位：分", example = "7462")
-    @ExcelProperty("一级分销的佣金，单位：分")
-    private Integer firstBrokeragePrice;
-
-    @Schema(description = "二级分销的佣金，单位：分", example = "32532")
-    @ExcelProperty("二级分销的佣金，单位：分")
-    private Integer secondBrokeragePrice;
-
     @Schema(description = "商品销量", example = "7812")
     @ExcelProperty("商品销量")
     private Integer salesCount;
@@ -87,16 +79,7 @@ public class SkuApplyRespVO {
     @ExcelProperty("商户id")
     private Long merchantId;
 
-    @Schema(description = "高精度价格", example = "15815")
-    @ExcelProperty("高精度价格")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "结算价，单位： 分", example = "21066")
     @ExcelProperty("结算价，单位： 分")
     private Integer settlementPrice;
-
-    @Schema(description = "高精度结算价", example = "1872")
-    @ExcelProperty("高精度结算价")
-    private BigDecimal highPrecisionSettlementPrice;
-
 }

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

@@ -50,12 +50,6 @@ public class SkuApplySaveReqVO {
     @Schema(description = "商品体积，单位：m^3 平米")
     private Double volume;
 
-    @Schema(description = "一级分销的佣金，单位：分", example = "7462")
-    private Integer firstBrokeragePrice;
-
-    @Schema(description = "二级分销的佣金，单位：分", example = "32532")
-    private Integer secondBrokeragePrice;
-
     @Schema(description = "商品销量", example = "7812")
     private Integer salesCount;
 
@@ -65,13 +59,6 @@ public class SkuApplySaveReqVO {
     @Schema(description = "商户id", example = "9994")
     private Long merchantId;
 
-    @Schema(description = "高精度价格", example = "15815")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "结算价，单位： 分", example = "21066")
     private Integer settlementPrice;
-
-    @Schema(description = "高精度结算价", example = "1872")
-    private BigDecimal highPrecisionSettlementPrice;
-
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/skuapply/SkuApplyDO.java

@@ -73,14 +73,6 @@ public class SkuApplyDO extends BaseDO {
      * 商品体积，单位：m^3 平米
      */
     private Double volume;
-    /**
-     * 一级分销的佣金，单位：分
-     */
-    private Integer firstBrokeragePrice;
-    /**
-     * 二级分销的佣金，单位：分
-     */
-    private Integer secondBrokeragePrice;
     /**
      * 商品销量
      */
@@ -93,17 +85,9 @@ public class SkuApplyDO extends BaseDO {
      * 商户id
      */
     private Long merchantId;
-    /**
-     * 高精度价格
-     */
-    private BigDecimal highPrecisionPrice;
     /**
      * 结算价，单位： 分
      */
     private Integer settlementPrice;
-    /**
-     * 高精度结算价
-     */
-    private BigDecimal highPrecisionSettlementPrice;
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/skuapply/SkuApplyMapper.java

@@ -31,15 +31,11 @@ public interface SkuApplyMapper extends BaseMapperX<SkuApplyDO> {
                 .eqIfPresent(SkuApplyDO::getStock, reqVO.getStock())
                 .eqIfPresent(SkuApplyDO::getWeight, reqVO.getWeight())
                 .eqIfPresent(SkuApplyDO::getVolume, reqVO.getVolume())
-                .eqIfPresent(SkuApplyDO::getFirstBrokeragePrice, reqVO.getFirstBrokeragePrice())
-                .eqIfPresent(SkuApplyDO::getSecondBrokeragePrice, reqVO.getSecondBrokeragePrice())
                 .eqIfPresent(SkuApplyDO::getSalesCount, reqVO.getSalesCount())
                 .betweenIfPresent(SkuApplyDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(SkuApplyDO::getShopId, reqVO.getShopId())
                 .eqIfPresent(SkuApplyDO::getMerchantId, reqVO.getMerchantId())
-                .eqIfPresent(SkuApplyDO::getHighPrecisionPrice, reqVO.getHighPrecisionPrice())
                 .eqIfPresent(SkuApplyDO::getSettlementPrice, reqVO.getSettlementPrice())
-                .eqIfPresent(SkuApplyDO::getHighPrecisionSettlementPrice, reqVO.getHighPrecisionSettlementPrice())
                 .orderByDesc(SkuApplyDO::getId));
     }
 

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/spuapply/SpuApplyMapper.java

@@ -33,7 +33,7 @@ public interface SpuApplyMapper extends BaseMapperX<SpuApplyDO> {
                 .eqIfPresent(SpuApplyDO::getProducerArea, reqVO.getProducerArea())
                 .eqIfPresent(SpuApplyDO::getSpuType, reqVO.getSpuType())
                 .eqIfPresent(SpuApplyDO::getCategoryId, reqVO.getCategoryId())
-                .eqIfPresent(SpuApplyDO::getBrandId, reqVO.getBrandId())
+                .eqIfPresent(SpuApplyDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(SpuApplyDO::getPicUrl, reqVO.getPicUrl())
                 .eqIfPresent(SpuApplyDO::getSliderPicUrls, reqVO.getSliderPicUrls())
                 .eqIfPresent(SpuApplyDO::getSort, reqVO.getSort())
@@ -45,8 +45,6 @@ public interface SpuApplyMapper extends BaseMapperX<SpuApplyDO> {
                 .eqIfPresent(SpuApplyDO::getStock, reqVO.getStock())
                 .eqIfPresent(SpuApplyDO::getDeliveryTypes, reqVO.getDeliveryTypes())
                 .eqIfPresent(SpuApplyDO::getDeliveryTemplateId, reqVO.getDeliveryTemplateId())
-                .eqIfPresent(SpuApplyDO::getGiveIntegral, reqVO.getGiveIntegral())
-                .eqIfPresent(SpuApplyDO::getSubCommissionType, reqVO.getSubCommissionType())
                 .eqIfPresent(SpuApplyDO::getSalesCount, reqVO.getSalesCount())
                 .eqIfPresent(SpuApplyDO::getVirtualSalesCount, reqVO.getVirtualSalesCount())
                 .eqIfPresent(SpuApplyDO::getBrowseCount, reqVO.getBrowseCount())
@@ -55,9 +53,6 @@ public interface SpuApplyMapper extends BaseMapperX<SpuApplyDO> {
                 .eqIfPresent(SpuApplyDO::getMerchantId, reqVO.getMerchantId())
                 .eqIfPresent(SpuApplyDO::getHidden, reqVO.getHidden())
                 .eqIfPresent(SpuApplyDO::getPromotionFee, reqVO.getPromotionFee())
-                .eqIfPresent(SpuApplyDO::getSpuPayType, reqVO.getSpuPayType())
-                .eqIfPresent(SpuApplyDO::getHighPrecision, reqVO.getHighPrecision())
-                .eqIfPresent(SpuApplyDO::getHighPrecisionPrice, reqVO.getHighPrecisionPrice())
                 .eqIfPresent(SpuApplyDO::getApplyMemberUserId, reqVO.getApplyMemberUserId())
                 .eqIfPresent(SpuApplyDO::getCheckSystemUserId, reqVO.getCheckSystemUserId())
                 .betweenIfPresent(SpuApplyDO::getCheckTime, reqVO.getCheckTime())

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

@@ -20,9 +20,6 @@ public class TradeOrderPageItemRespVO extends TradeOrderBaseVO {
     @Schema(description = "用户信息", requiredMode = Schema.RequiredMode.REQUIRED)
     private MemberUserRespVO user;
 
-    @Schema(description = "推广人信息")
-    private MemberUserRespVO brokerageUser;
-
     @Schema(description = "管理后台 - 交易订单的分页项的订单项目")
     @Data
     public static class Item extends TradeOrderItemBaseVO {

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/price/calculator/TradePriceCalculatorHelper.java

@@ -254,7 +254,7 @@ public class TradePriceCalculatorHelper {
             TradeOrderItemDO orderItem = items.get(i);
             int partPrice;
             if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
-                partPrice = (int) (price * (1.0D * orderItem.getPayPrice() / total));
+                partPrice = (int) (price * (1.0D * orderItem.getPayIntegral() / total));
                 remainPrice -= partPrice;
             } else {
                 partPrice = remainPrice;