..

src/main/java/io/renren/modules/sales/controller/SaleCommissionController.java

@@ -23,7 +23,7 @@ import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.sales.entity.SaleCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderEntity;
import io.renren.modules.sales.entity.SaleOrderItemCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderUnionItemEntity;
import io.renren.modules.sales.entity.SaleOrderItemEntity;
import io.renren.modules.sales.entity.SaleSellerFeeEntity;
import io.renren.modules.sales.service.SaleCommissionService;
@@ -184,7 +184,7 @@ public class SaleCommissionController extends AbstractController {
            return R.error("年月不可为空");
        }
        List<SaleOrderItemCommissionEntity> commissionlist = saleCommissionService.queryMonthCommissionItemList(params);
        List<SaleOrderUnionItemEntity> commissionlist = saleCommissionService.queryMonthCommissionItemList(params);
        // 一般总利润
        BigDecimal hqTotalProfit = new BigDecimal("0.00");
@@ -231,28 +231,28 @@ public class SaleCommissionController extends AbstractController {
            commissionSummaryList.add(commissionSummary);
        }
        // 业余员提成
        for (int k = 0; k < commissionlist.size(); k++) {
            SaleOrderItemCommissionEntity commission = commissionlist.get(k);
            for (CommissionSummaryUtils commissionSummary : commissionSummaryList) {
                if (commission.getSellerId() == commissionSummary.getSellerId()) {
                    if (commission.getCommissionType() == 1 && commission.getProfit() != null) {
                        commissionSummary
                                .setTotalProfit(commissionSummary.getTotalProfit().add(commission.getProfit()));
                                hqTotalProfit = hqTotalProfit.add(commission.getProfit());
                    }
                    if (commission.getCommissionType() == 2 && commission.getMoney() != null) {
                        commissionSummary
                                .setSpecialMoney(commissionSummary.getSpecialMoney().add(commission.getMoney()));
                        commissionSummary
                                .setSpecialValue(commissionSummary.getSpecialValue().add(commission.getSalesMoney()));
                        hqTotalSpecialValue = hqTotalSpecialValue.add(commission.getSalesMoney());
                    }
                }
            }
        }
        // // 业余员提成
        // for (int k = 0; k < commissionlist.size(); k++) {
        //     SaleOrderUnionItemEntity commission = commissionlist.get(k);
        //     for (CommissionSummaryUtils commissionSummary : commissionSummaryList) {
        //         if (commission.getSellerId() == commissionSummary.getSellerId()) {
        //             if (commission.getCommissionType() == 1 && commission.getProfit() != null) {
        //                 commissionSummary
        //                         .setTotalProfit(commissionSummary.getTotalProfit().add(commission.getProfit()));
        //                         hqTotalProfit = hqTotalProfit.add(commission.getProfit());
        //             }
        //             if (commission.getCommissionType() == 2 && commission.getMoney() != null) {
        //                 commissionSummary
        //                         .setSpecialMoney(commissionSummary.getSpecialMoney().add(commission.getMoney()));
        //                 commissionSummary
        //                         .setSpecialValue(commissionSummary.getSpecialValue().add(commission.getSalesMoney()));
        //                 hqTotalSpecialValue = hqTotalSpecialValue.add(commission.getSalesMoney());
        //             }
        //         }
        //     }
        // }
        for (CommissionSummaryUtils commissionSummary : commissionSummaryList) {
            commissionSummary.setGeneralMoney(commissionSummary.getTotalProfit()
                    .subtract(commissionSummary.getOtherFee()).multiply(commissionSummary.getGeneralRatio())
@@ -338,7 +338,7 @@ public class SaleCommissionController extends AbstractController {
            return R.error("年月不可为空");
        }
        List<SaleOrderItemCommissionEntity> list =  saleCommissionService.queryMonthCommissionItemList(params);
        List<SaleOrderUnionItemEntity> list =  saleCommissionService.queryMonthCommissionItemList(params);
        return R.ok().put("list", list);
    }

src/main/java/io/renren/modules/sales/dao/SaleCommissionDao.java

@@ -1,6 +1,6 @@
package io.renren.modules.sales.dao;
import io.renren.modules.sales.entity.SaleOrderItemCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderUnionItemEntity;
import io.renren.modules.sales.utils.CommissionSummaryUtils;
import io.renren.modules.sales.entity.SaleCommissionEntity;
@@ -34,10 +34,10 @@ public interface SaleCommissionDao extends BaseMapper<SaleCommissionEntity> {
    + "truncate(ifnull(((select sum(`p`.`pay_money`) from `sy_sale_order_payment` `p` where (`soi`.`id` = `p`.`order_item_id`)) / 100),0),2) AS `pay_money`,"
    + "truncate(ifnull(((select sum(`t`.`fare`) from `sy_sale_order_transport` `t` where (`soi`.`id` = `t`.`order_item_id`)) / 100),0),2) AS `fare`"
    + " from (`sy_sale_commission` `sc` join `sy_sale_order_item` `soi` on((`sc`.`order_id` = `soi`.`order_id`))) ${ew.customSqlSegment}")
    List<SaleOrderItemCommissionEntity> queryMonthCommissionItemList(@Param(Constants.WRAPPER) QueryWrapper<SaleOrderItemCommissionEntity> ew);
    List<SaleOrderUnionItemEntity> queryMonthCommissionItemList(@Param(Constants.WRAPPER) QueryWrapper<SaleOrderUnionItemEntity> ew);
    List<CommissionSummaryUtils> querySellerGroupCommission(Integer year, Integer month, int i);
    @Delete("delete from sy_sale_commission where order_id=#{orderId}")
	void removeByOrderId(Long orderId);
    void removeByOrderId(Long orderId);
}

src/main/java/io/renren/modules/sales/entity/SaleOrderEntity.java

@@ -36,7 +36,7 @@ public class SaleOrderEntity implements Serializable {
    @TableId
    private Long id;
    /**
     * 序号, 格式 MHTNO
     * 序号, 格式 yyyymmno
     */
    private String no;
    /**

src/main/java/io/renren/modules/sales/entity/SaleOrderItemCommissionEntity.java

@@ -1,156 +0,0 @@
package io.renren.modules.sales.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import io.renren.convert.YuanToFenTypeHandler;
import lombok.Data;
/**
 * 销售订单产品明细  提成实体类
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2021-04-14 11:03:56
 */
@Data
@TableName(value = "sy_sale_order_item", autoResultMap = true)
public class SaleOrderItemCommissionEntity implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * id
     */
    @TableId
    private Long id;
    /**
     * 订单id
     */
    private Long orderId;
    /**
     * 种类名称
     */
    private String productsCategoryName;
    /**
     * 产品名称
     */
    private String productsName;
    /**
     * 产品价格 单位元(数据库存整数分, 下同)
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal productsPrice;
    /**
     * 销售数量(单位KG/台)
     */
    private BigDecimal salesAmount;
    /**
     * 销售价格 单位元
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal salesPrice;
    /**
     * 销售金额
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal salesMoney;
    /**
     * 实际发货量(单位KG/台)
     */
    // private BigDecimal actualAmount;
    /**
     * 实际成交价格, 单位元
     */
    // @TableField(typeHandler = YuanToFenTypeHandler.class)
    // private BigDecimal actualPrice;
    /**
     * 实际金额, 单位元
     */
    // @TableField(typeHandler = YuanToFenTypeHandler.class)
    // private BigDecimal actualMoney;
    /**
     * 代理费
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal agency;
    /**
     * 其他费用
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal otherFee;
    /**
     * 提成类别: 1,一般, 2, 特批1, 3, 特批2
     */
    private Integer commissionType;
    /**
     * 合同号
     */
    @TableField(exist = false)
    private String contractNo;
    /**
     * 销售时间
     */
    @TableField(exist = false)
    private String contractTime;
    /**
     * 客户名称
     */
    @TableField(exist = false) 
    private String clientName;
    /**
     * 销售员id
     */
    @TableField(exist = false)
    private Long sellerId;
    /**
     * 销售员
     */
    @TableField(exist = false)
    private String sellerName;
    /**
     * 销售部门
     */
    @TableField(exist = false)
    private String sellerDepartmentName;
    /**
     * 运费
     */
    @TableField(exist=false)
    private BigDecimal fare;
    /**
     * 总到款金额
     */
    @TableField(exist=false)
    private BigDecimal payMoney;
    /**
     * 合同基准额
     */
    @TableField(exist=false)
    private BigDecimal baseMoney;
    /**
     * 总利润
     */
    @TableField(exist=false)
    private BigDecimal profit;
    /**
     * 价格比例
     */
    @TableField(exist=false)
    private BigDecimal priceRate;
    /**
     * 提成比例(百分比)
     */
    @TableField(exist=false)
    private BigDecimal commissionRate;
    /**
     * 提成金额
     */
    @TableField(exist=false)
    private BigDecimal money;
}

src/main/java/io/renren/modules/sales/entity/SaleOrderItemEntity.java

@@ -149,55 +149,4 @@ public class SaleOrderItemEntity implements Serializable {
     */
    @TableField(exist=false)
    private List<SaleOrderTransportEntity> saleOrderTransports;
    /**
     * 合同号
     */
    @TableField(exist = false)
    private String contractNo;
    /**
     * 销售时间
     */
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date contractTime;
    /**
     * 客户id
     */
    @TableField(exist = false) 
    private Long clientId;
    /**
     * 客户名称
     */
    @TableField(exist = false) 
    private String clientName;
    /**
     * 销售员
     */
    @TableField(exist = false)
    private String sellerName;
    /**
     * 是否完成提成
     */
    @TableField(exist = false)
    private Long isCommission;
    /**
     * 销售部门
     */
    private String sellerDepartmentName;
    /**
     * 总收款
     */
    @TableField(exist = false)
    private BigDecimal PayMoney;
    /**
     * 运费
     */
    @TableField(exist=false)
    private BigDecimal fare;
    /**
     * u8 订单编号
     */
    @TableField(exist = false)
    private String u8id;
}

src/main/java/io/renren/modules/sales/service/SaleCommissionService.java

@@ -3,7 +3,7 @@ package io.renren.modules.sales.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.sales.entity.SaleCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderItemCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderUnionItemEntity;
import java.util.List;
import java.util.Map;
@@ -24,7 +24,7 @@ public interface SaleCommissionService extends IService<SaleCommissionEntity> {
	 * @param params
	 * @return
	 */
	List<SaleOrderItemCommissionEntity> queryMonthCommissionItemList(Map<String, Object> params);
	List<SaleOrderUnionItemEntity> queryMonthCommissionItemList(Map<String, Object> params);
	/** 通过订单id删除提成 */
	void removeByOrderId(Long orderId);

src/main/java/io/renren/modules/sales/service/impl/SaleCommissionServiceImpl.java

@@ -14,7 +14,7 @@ import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.sales.dao.SaleCommissionDao;
import io.renren.modules.sales.entity.SaleCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderItemCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderUnionItemEntity;
import io.renren.modules.sales.service.SaleCommissionService;
import io.renren.modules.sales.utils.CommissionUtils;
@@ -43,7 +43,7 @@ public class SaleCommissionServiceImpl extends ServiceImpl<SaleCommissionDao, Sa
    }
    @Override
    public List<SaleOrderItemCommissionEntity> queryMonthCommissionItemList(Map<String, Object> params) {
    public List<SaleOrderUnionItemEntity> queryMonthCommissionItemList(Map<String, Object> params) {
        String key = params.containsKey("key") ? (String) params.get("key") : null;
        Integer year = 0;
@@ -62,14 +62,14 @@ public class SaleCommissionServiceImpl extends ServiceImpl<SaleCommissionDao, Sa
        Long sellerId = params.containsKey("sellerId") ? Long.valueOf((String) params.get("sellerId")) : 0L;
        List<SaleOrderItemCommissionEntity> list = baseMapper
                .queryMonthCommissionItemList(new QueryWrapper<SaleOrderItemCommissionEntity>()
        List<SaleOrderUnionItemEntity> list = baseMapper
                .queryMonthCommissionItemList(new QueryWrapper<SaleOrderUnionItemEntity>()
                        .eq(commissionType != 0, "`soi`.`commission_type`", commissionType)
                        .eq(year != 0, "`year`", year).eq(month != 0, "`month`", month)
                        .eq(sellerId != 0L, "`seller_id`", sellerId).and(StringUtils.isNotBlank(key),
                                Wrapper -> Wrapper.like("`client_name`", key).or().like("`contract_no`", key)));
        for (SaleOrderItemCommissionEntity orderItemCommisson : list) {
        for (SaleOrderUnionItemEntity orderItemCommisson : list) {
            orderItemCommisson = CommissionUtils.handOrderItemCommission(orderItemCommisson);
        }

src/main/java/io/renren/modules/sales/utils/CommissionUtils.java

@@ -2,8 +2,7 @@ package io.renren.modules.sales.utils;
import java.math.BigDecimal;
import io.renren.modules.sales.entity.SaleOrderItemEntity;
import io.renren.modules.sales.entity.SaleOrderItemCommissionEntity;
import io.renren.modules.sales.entity.SaleOrderUnionItemEntity;
public class CommissionUtils {
	// 提成比例(百分比)
@@ -58,42 +57,6 @@ public class CommissionUtils {
		this.generalMoney = generalMoney;
	}
	public CommissionUtils(SaleOrderItemEntity saleOrderItem) {
		switch (saleOrderItem.getCommissionType()) {
			case 2:
				this.priceRate = saleOrderItem.getActualPrice().divide(saleOrderItem.getProductsPrice(), 4,
						BigDecimal.ROUND_HALF_UP);
				if (this.priceRate.compareTo(LevelA) < 0) {
					this.speciallRatio = new BigDecimal("0.01");
				} else if (this.priceRate.compareTo(LevelB) < 0) {
					this.speciallRatio = new BigDecimal("0.015");
				} else {
					this.speciallRatio = new BigDecimal("0.02");
				}
				this.generalMoney = new BigDecimal("0.00");
				this.specialMoney = saleOrderItem.getActualMoney().subtract(saleOrderItem.getFare())
						.subtract(saleOrderItem.getAgency()).multiply(this.speciallRatio)
						.setScale(2, BigDecimal.ROUND_HALF_UP);
				break;
			case 3:
				this.priceRate = saleOrderItem.getActualPrice().divide(saleOrderItem.getProductsPrice(), 4,
						BigDecimal.ROUND_HALF_UP);
				this.speciallRatio = this.specialSS
						.add(this.priceRate.subtract(new BigDecimal("1")).divide(new BigDecimal("0.1"))
								.divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_DOWN));
				this.generalMoney = new BigDecimal("0.00");
				this.specialMoney = saleOrderItem.getActualMoney().subtract(saleOrderItem.getFare())
						.subtract(saleOrderItem.getAgency()).multiply(this.speciallRatio)
						.setScale(2, BigDecimal.ROUND_HALF_UP);
				break;
			default:
				this.generalMoney = (saleOrderItem.getActualPrice().subtract(saleOrderItem.getProductsPrice()))
						.multiply(saleOrderItem.getActualAmount()).subtract(saleOrderItem.getFare())
						.subtract(saleOrderItem.getAgency()).setScale(2, BigDecimal.ROUND_HALF_UP);
				this.specialMoney = new BigDecimal("0.00");
				break;
		}
	}
	public BigDecimal getGeneralMoney() {
		return this.generalMoney;
@@ -111,8 +74,8 @@ public class CommissionUtils {
		this.generalMoney = money;
	}
	public static SaleOrderItemCommissionEntity handOrderItemCommission(
			SaleOrderItemCommissionEntity orderItemCommisson) {
	public static SaleOrderUnionItemEntity handOrderItemCommission(
			SaleOrderUnionItemEntity orderItemCommisson) {
		if (orderItemCommisson.getCommissionType() == 1) {
			orderItemCommisson
					.setBaseMoney(orderItemCommisson.getProductsPrice().multiply(orderItemCommisson.getSalesAmount()));