..

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

@@ -45,19 +45,6 @@ public class SaleOrderItemController extends AbstractController {
        return R.ok().put("page", page);
    }
    /**
     * 列表
     * @param orderId
     * @return
     */
    @GetMapping("/list/{orderId}")
    @RequiresPermissions("sales:saleorderitem:list")
    public R list(@PathVariable("orderId") Long orderId){
        List<SaleOrderItemEntity> list = saleOrderItemService.listByOrderId(orderId);
        PageUtils page = new PageUtils(list, 1, 10, 1);
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */

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

@@ -1,10 +1,6 @@
package io.renren.modules.sales.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,14 +9,10 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.sales.entity.SaleOrderItemEntity;
import io.renren.modules.sales.entity.SaleOrderPaymentEntity;
import io.renren.modules.sales.service.SaleOrderItemService;
import io.renren.modules.sales.service.SaleOrderPaymentService;
import io.renren.modules.sys.controller.AbstractController;

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

@@ -3,6 +3,7 @@ package io.renren.modules.sales.controller;
import java.util.Arrays;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.sales.entity.SaleSellerFeeEntity;
import io.renren.modules.sales.service.SaleSellerFeeService;
import io.renren.modules.sys.controller.AbstractController;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
@@ -27,7 +29,7 @@ import io.renren.common.utils.R;
 */
@RestController
@RequestMapping("sales/salesellerfee")
public class SaleSellerFeeController {
public class SaleSellerFeeController  extends AbstractController {
    @Autowired
    private SaleSellerFeeService saleSellerFeeService;
@@ -42,36 +44,25 @@ public class SaleSellerFeeController {
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */
    @RequestMapping("/info/{sellerId}")
    @RequestMapping("/info/{id}")
    @RequiresPermissions("sales:salesellerfee:info")
    public R info(@PathVariable("sellerId") Long sellerId){
		SaleSellerFeeEntity saleSellerFee = saleSellerFeeService.getById(sellerId);
    public R info(@PathVariable("id") Long id){
		SaleSellerFeeEntity saleSellerFee = saleSellerFeeService.getById(id);
        return R.ok().put("saleSellerFee", saleSellerFee);
    }
    /**
     * 保存
     * 保存或修改
     */
    @RequestMapping("/save")
    @RequestMapping("/savefee")
    @RequiresPermissions("sales:salesellerfee:save")
    public R save(@RequestBody SaleSellerFeeEntity saleSellerFee){
		saleSellerFeeService.save(saleSellerFee);
        return R.ok();
    }
    /**
     * 修改
     */
    @RequestMapping("/update")
    @RequiresPermissions("sales:salesellerfee:update")
    public R update(@RequestBody SaleSellerFeeEntity saleSellerFee){
		saleSellerFeeService.updateById(saleSellerFee);
    public R saveSellerFee(@RequestBody SaleSellerFeeEntity saleSellerFee){
        saleSellerFee.setCreateUserId(getUserId());
        saleSellerFeeService.saveSellerFee(saleSellerFee);
        return R.ok();
    }

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

@@ -1,10 +1,8 @@
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.entity.SaleOrderItemEntity;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,18 +37,18 @@ public interface SaleOrderItemDao extends BaseMapper<SaleOrderItemEntity> {
	+ " truncate(ifnull(((select sum(`sop`.`pay_money`) from `sy_sale_order_payment` `sop` where(`soi`.`id` = `sop`.`order_item_id`)) / 100),0),2)"
	+ " AS `pay_money`,truncate(ifnull(((select sum(`sot`.`fare`) from `sy_sale_order_transport` as `sot` where (`soi`.`id` = `sot`.`order_item_id`)) / 100),0),2)"
	+ " AS `fare` from (`sy_sale_order_item` `soi` join `sy_sale_order` `so` on((`soi`.`order_id` = `so`.`id`))) ${ew.customSqlSegment}")
	IPage<SaleOrderItemEntity> queryMorePage(IPage<SaleOrderItemEntity> page, @Param(Constants.WRAPPER) QueryWrapper<SaleOrderItemEntity> ew);
	IPage<SaleOrderUnionItemEntity> queryMorePage(IPage<SaleOrderUnionItemEntity> page, @Param(Constants.WRAPPER) QueryWrapper<SaleOrderUnionItemEntity> ew);
	@Select("select `soi`.`id` AS `id`,`soi`.`order_id` AS `order_id`,`so`.`contract_no` AS `contract_no`,`so`.`contract_time` AS `contract_time`,"
	+ "`soi`.`products_category_name` AS `products_category_name`,`soi`.`products_id` AS `products_id`,`soi`.`products_name` AS `products_name`,"
	+ "`soi`.`products_price` AS `products_price`,`soi`.`products_identifier` AS `products_identifier`,`soi`.`sales_amount` AS `sales_amount`,"
	+ "`soi`.`sales_price` AS `sales_price`,`soi`.`sales_money` AS `sales_money`,`soi`.`agency` AS `agency`,`soi`.`other_fee` AS `other_fee`,"
	+ "`soi`.`commission_type` AS `commission_type`,`soi`.`commission_rate` AS `commission_rate`,`so`.`client_name` AS `client_name`,"
	+ "`so`.`seller_name` AS `seller_name`,`so`.`is_review` AS `is_review`,month(`so`.`contract_time`) AS `month`,year(`so`.`contract_time`) AS `year`,"
	+ "ifnull(`sy_sale_commission`.`id`,0) AS `is_commission`,truncate(ifnull(((select sum(`sop`.`pay_money`) from `sy_sale_order_payment` `sop`"
	+ " where (`soi`.`id` = `sop`.`order_item_id`)) / 100),0),2) AS `pay_money`,truncate(ifnull(((select sum(`sot`.`fare`) from `sy_sale_order_transport`"
	+ " `sot` where (`soi`.`id` = `sot`.`order_item_id`)) / 100),0),2) AS `fare` from ((`sy_sale_order_item` `soi` join `sy_sale_order` `so`"
	+ " on((`soi`.`order_id` = `so`.`id`))) left join `sy_sale_commission` on((`soi`.`order_id` = `sy_sale_commission`.`order_id`)))  ${ew.customSqlSegment}")
	IPage<SaleOrderItemCommissionEntity> queryCommissionItemPage(IPage<SaleOrderItemCommissionEntity> page, @Param(Constants.WRAPPER) QueryWrapper<SaleOrderItemCommissionEntity> ew);
	// @Select("select `soi`.`id` AS `id`,`soi`.`order_id` AS `order_id`,`so`.`contract_no` AS `contract_no`,`so`.`contract_time` AS `contract_time`,"
	// + "`soi`.`products_category_name` AS `products_category_name`,`soi`.`products_id` AS `products_id`,`soi`.`products_name` AS `products_name`,"
	// + "`soi`.`products_price` AS `products_price`,`soi`.`products_identifier` AS `products_identifier`,`soi`.`sales_amount` AS `sales_amount`,"
	// + "`soi`.`sales_price` AS `sales_price`,`soi`.`sales_money` AS `sales_money`,`soi`.`agency` AS `agency`,`soi`.`other_fee` AS `other_fee`,"
	// + "`soi`.`commission_type` AS `commission_type`,`soi`.`commission_rate` AS `commission_rate`,`so`.`client_name` AS `client_name`,"
	// + "`so`.`seller_name` AS `seller_name`,`so`.`is_review` AS `is_review`,month(`so`.`contract_time`) AS `month`,year(`so`.`contract_time`) AS `year`,"
	// + "ifnull(`sy_sale_commission`.`id`,0) AS `is_commission`,truncate(ifnull(((select sum(`sop`.`pay_money`) from `sy_sale_order_payment` `sop`"
	// + " where (`soi`.`id` = `sop`.`order_item_id`)) / 100),0),2) AS `pay_money`,truncate(ifnull(((select sum(`sot`.`fare`) from `sy_sale_order_transport`"
	// + " `sot` where (`soi`.`id` = `sot`.`order_item_id`)) / 100),0),2) AS `fare` from ((`sy_sale_order_item` `soi` join `sy_sale_order` `so`"
	// + " on((`soi`.`order_id` = `so`.`id`))) left join `sy_sale_commission` on((`soi`.`order_id` = `sy_sale_commission`.`order_id`)))  ${ew.customSqlSegment}")
	// IPage<SaleOrderItemCommissionEntity> queryCommissionItemPage(IPage<SaleOrderItemCommissionEntity> page, @Param(Constants.WRAPPER) QueryWrapper<SaleOrderItemCommissionEntity> ew);
		
}

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

@@ -1,20 +0,0 @@
package io.renren.modules.sales.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import io.renren.modules.sales.entity.SaleOrderSummaryEntity;
/**
 * 销售订单汇总信息
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2021-04-14 11:03:56
 */
@Mapper
public interface SaleOrderSummaryDao extends BaseMapper<SaleOrderSummaryEntity> {
}

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

@@ -1,13 +1,16 @@
package io.renren.modules.sales.dao;
import io.renren.modules.sales.entity.SaleSellerFeeEntity;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import io.renren.modules.sales.entity.SaleSellerFeeEntity;
/**
 * 销售员
 * 
@@ -17,5 +20,11 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface SaleSellerFeeDao extends BaseMapper<SaleSellerFeeEntity> {
    @Select("select `sf`.`id` AS `id`,`sf`.`seller_id` AS `seller_id`,`sf`.`other_fee` AS `other_fee`,`sf`.`month` AS `month`,"
    + "`sf`.`year` AS `year`,`sf`.`create_user_id` AS `create_user_id`,`sf`.`create_time` AS `create_time`,`sf`.`overdraft` AS"
    + " `overdraft`,`su`.`username` AS `seller_name`,concat_ws('-',`sf`.`year`,`sf`.`month`) AS `year_month`,`sf`.`remark` "
    + " from (`sy_sale_seller_fee` `sf` join `sy_sys_user` `su` on((`sf`.`seller_id` = `su`.`user_id`))) ${ew.customSqlSegment}")
	IPage<SaleSellerFeeEntity> queryPage(IPage<SaleSellerFeeEntity> page, @Param(Constants.WRAPPER)  QueryWrapper<SaleSellerFeeEntity> ew);
	
}

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

@@ -135,6 +135,10 @@ public class SaleOrderItemEntity implements Serializable {
     * 录入时间
     */
    private Date createTime;
    /**
     * ud orderItem 编号
     */
    private String u8itemid;
    /**
     * 付款详情
     */
@@ -196,8 +200,4 @@ public class SaleOrderItemEntity implements Serializable {
     */
    @TableField(exist = false)
    private String u8id;
     /**
     * ud orderItem 编号
     */
    private String u8itemid;
}

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

@@ -1,162 +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 com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.io.Serializable;
import io.renren.convert.YuanToFenTypeHandler;
import java.util.Date;
import lombok.Data;
/**
 * View
 * @author huwhois
 * @email huwhois@163.com
 * @date 2021-04-16 15:36:23
 */
@Data
@TableName(value = "sy_sale_order_summary",autoResultMap = true)
public class SaleOrderSummaryEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * id
	 */
	@TableId
	private Long id;
	/**
	 * 序号, 格式 MHTNO
	 */
	private String no;
	/**
	 * 合同号
	 */
	private String contractNo;
	/**
	 * 销售时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd")
	@DateTimeFormat(pattern="yyyy-MM-dd")
	private Date contractTime;
	/**
	 * 合同类型
	 */
	private Integer contractType;
	/**
	 * 合同金额(单位元)
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal contractMoney;
	/**
	 * 实际金额(单位元)
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal actualMoney;
	/**
	 * 客户id
	 */
	private Long clientId;
	/**
	 * 客户名称
	 */
	private String clientName;
	/**
	 * 销售员id
	 */
	private Long sellerId;
	/**
	 * 销售员名称
	 */
	private String sellerName;
	/**
	 * 销售员部门
	 */
	private Long sellerDepartmentId;
	/**
	 * 销售员部门
	 */
	private String sellerDepartmentName;
	/**
     * 销售供应商id
     */
    private Long supplyId;
    /**
     * 销售供应商名称
     */
    private String supplyName;
	/**
	 * 付款方式
	 */
	private String payType;
	/**
	 * 状态, 0 正常(正在进行), -1 作废(取消)
	 */
	private Integer status;
	/**
	 * 备注
	 */
	private String remark;
	/**
	 * 数据录入时间
	 */
	private Date createTime;
	/**
	 * 创建者ID
	 */
	private Long createUserId;
	/**
	 * 审核状态, 0 未审核, 1 已审核
	 */
	private Integer isReview;
	/**
	 * 审核时间
	 */
	private Date reviewTime;
	/**
	 * 审核者ID
	 */
	private Long reviewUserId;
	/**
	 * 审核者
	 */
	private String reviewUsername;
	/**
	 * 年
	 */
	private Integer month;
	/**
	 * 月
	 */
	private Integer year;
	/**
	 * 是否提成
	 */
	private Long isCommission;
	/**
	 * 代理费
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal agency;
	/**
	 * 运费
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal fare;
	/**
	 * 到款
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal payment;
	/**
	 * 开票金额
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal taxMoney;
}

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

@@ -0,0 +1,221 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
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 SaleOrderUnionItemEntity implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * id
     */
    @TableId
    private Long id;
    /**
     * 订单id
     */
    private Long orderId;
    /**
     * 种类id
     */
    private Long productsCategoryId;
    /**
     * 种类名称
     */
    private String productsCategoryName;
    /**
     * 产品id
     */
    private Long productsId;
    /**
     * 产品名称
     */
    private String productsName;
    /**
     * 型号规格
     */
    private String specification;
    /**
     * 产品价格 单位元(数据库存整数分, 下同)
     */
    @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;
    /**
     * 实际合同价格(去代理费)单位元
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal realPrice;
    /**
     * 实际合同金额(去代理费)
     */
    @TableField(typeHandler = YuanToFenTypeHandler.class)
    private BigDecimal realMoney;
    /**
     * 实际发货量(单位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;
    /**
     * 0,正常; -1, 取消
     */
    private Integer status;
    /**
     * 备注
     */
    private String remark;
    /**
     * 创建者ID
     */
    private Long createUserId;
    /**
     * 创建者
     */
    @TableField(exist=false)
    private String createUsername;
    /**
     * 录入时间
     */
    private Date createTime;
    /**
     * ud orderItem 编号
     */
    private String u8itemid;
    /**
     * 总收款
     */
    @TableField(exist = false)
    private BigDecimal PayMoney;
    /**
     * 运费
     */
    @TableField(exist=false)
    private BigDecimal fare;
    // order 属性
    /**
     * 合同号
     */
    @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 String sellerDepartmentName;
    /**
     * u8 订单编号
     */
    @TableField(exist = false)
    private String u8id;
    // commission 属性
    /**
     * 是否完成提成
     */
    @TableField(exist = false)
    private Long isCommission;
    /**
     * 合同基准额
     */
    @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/SaleSellerFeeEntity.java

@@ -53,10 +53,24 @@ public class SaleSellerFeeEntity implements Serializable {
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 备注
	 */
	private String remark;
	/**
	 * 历史欠款
	 */
	@TableField(typeHandler = YuanToFenTypeHandler.class)
	private BigDecimal overdraft;
	/**
	 * 销售员姓名
	 */
	@TableField(exist = false)
	private String sellerName;
	/**
	 * 年月
	 */
	@TableField(exist = false)
	private String yearMonth;
}

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

@@ -33,7 +33,5 @@ public interface SaleOrderItemService extends IService<SaleOrderItemEntity> {
	void saveItem(SaleOrderItemEntity saleOrderItem);
	void updateItem(SaleOrderItemEntity saleOrderItem);
	PageUtils queryCommissionPage(Map<String, Object> params);
}

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

@@ -1,21 +0,0 @@
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.SaleOrderSummaryEntity;
import java.util.List;
import java.util.Map;
/**
 * 销售订单
 *
 * @author huwhois
 * @email huwhois@163.com
 * @date 2021-04-14 11:03:56
 */
public interface SaleOrderSummaryService extends IService<SaleOrderSummaryEntity> {
    PageUtils queryPage(Map<String, Object> params);
}

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

@@ -21,7 +21,7 @@ public interface SaleSellerFeeService extends IService<SaleSellerFeeEntity> {
    /**
     * 保存(更新)销售业务员月度其他业务费用
     */
    void saveSellerFee(SaleSellerFeeEntity sellerFee);
    void saveSellerFee(SaleSellerFeeEntity saleSellerFee);
    /**
     * 查询月度销售费用

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

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import io.renren.common.utils.PageUtils;
@@ -20,7 +19,7 @@ import io.renren.common.utils.Query;
import io.renren.modules.common.entity.ProductsEntity;
import io.renren.modules.common.service.ProductsService;
import io.renren.modules.sales.dao.SaleOrderItemDao;
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.service.SaleOrderItemService;
@@ -38,12 +37,12 @@ public class SaleOrderItemServiceImpl extends ServiceImpl<SaleOrderItemDao, Sale
        String key = (String) params.get("key");
        Integer year = params.containsKey("year") ? Integer.parseInt((String) params.get("year")) : 0;
        Integer month = params.containsKey("month") ? Integer.parseInt((String) params.get("month")) : 0;
        Long sellerId = params.containsKey("sellerId") ? Long.valueOf((String) params.get("sellerId")) : 0L;
        Long orderId = params.containsKey("orderId") ? Long.valueOf((String) params.get("orderId")) : 0L;
        Long sellerId = params.containsKey("sellerId") && StringUtils.isNotBlank((String) params.get("sellerId")) ? Long.valueOf((String) params.get("sellerId")) : 0L;
        Long orderId = params.containsKey("orderId") && StringUtils.isNotBlank((String) params.get("orderId"))  ? Long.valueOf((String) params.get("orderId")) : 0L;
        IPage<SaleOrderItemEntity> page = baseMapper.queryMorePage(new Query<SaleOrderItemEntity>().getPage(params),
                new QueryWrapper<SaleOrderItemEntity>().eq(year != 0, "year(`contract_time`)", year)
                        .eq(month != 0, "month(`contract_time`)", month).eq(sellerId != 0L, "seller_id", sellerId)
        IPage<SaleOrderUnionItemEntity> page = baseMapper.queryMorePage(new Query<SaleOrderUnionItemEntity>().getPage(params),
                new QueryWrapper<SaleOrderUnionItemEntity>().eq(year != 0, "year(`so`.`contract_time`)", year)
                        .eq(month != 0, "month(`so`.`contract_time`)", month).eq(sellerId != 0L, "seller_id", sellerId)
                        .eq(orderId != 0L, "order_id", orderId).and(StringUtils.isNotBlank(key), Wrapper -> Wrapper
                                .like("`so`.`client_name`", key).or().like("`so`.`contract_no`", key)));
@@ -111,23 +110,4 @@ public class SaleOrderItemServiceImpl extends ServiceImpl<SaleOrderItemDao, Sale
        this.updateById(saleOrderItem);
    }
    @Override
    @Async
    public PageUtils queryCommissionPage(Map<String, Object> params) {
        String key = (String) params.get("key");
        Integer year = params.containsKey("year") ? Integer.parseInt((String) params.get("year")) : 0;
        Integer month = params.containsKey("month") ? Integer.parseInt((String) params.get("month")) : 0;
        Long sellerId = params.containsKey("sellerId") ? Long.valueOf((String) params.get("sellerId")) : 0L;
        IPage<SaleOrderItemCommissionEntity> page = baseMapper.queryCommissionItemPage(
                new Query<SaleOrderItemCommissionEntity>().getPage(params),
                new QueryWrapper<SaleOrderItemCommissionEntity>().eq(year != 0, "year(`so`.`contract_time`)", year)
                        .eq(month != 0, "month(`so`.`contract_time`)", month)
                        .eq(sellerId != 0L, "`so`.`seller_id`", sellerId)
                        .and(StringUtils.isNotBlank(key), Wrapper -> Wrapper.like("`so`.`client_name`", key).or()
                                .like("`so`.`contract_no`", key)));
        return new PageUtils(page);
    }
}

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

@@ -1,41 +0,0 @@
package io.renren.modules.sales.service.impl;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.sales.dao.SaleOrderSummaryDao;
import io.renren.modules.sales.entity.SaleOrderSummaryEntity;
import io.renren.modules.sales.service.SaleOrderSummaryService;
@Service("SaleOrderSummaryService")
public class SaleOrderSummaryServiceImpl extends ServiceImpl<SaleOrderSummaryDao, SaleOrderSummaryEntity>
        implements SaleOrderSummaryService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String key = (String) params.get("key");
        String sellerName = (String) params.get("seller_namey");
        Integer year = params.containsKey("year") ? Integer.parseInt((String) params.get("year")) : 0;
        Integer month = params.containsKey("month") ? Integer.parseInt((String) params.get("month")) : 0;
        Long createUserId = (Long) params.get("createUserId");
        IPage<SaleOrderSummaryEntity> page = this.page(new Query<SaleOrderSummaryEntity>().getPage(params),
                new QueryWrapper<SaleOrderSummaryEntity>().eq(year != 0, "year", year).eq(month != 0, "month", month)
                        .like(StringUtils.isNotBlank(key), "client_name", key).or()
                        .like(StringUtils.isNotBlank(key), "contract_no", key)
                        .eq(StringUtils.isNotBlank(sellerName), "seller_name", sellerName)
                        .eq("is_review", 1)
                        .eq(createUserId != null, "create_user_id", createUserId));
        return new PageUtils(page);
    }
}

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

@@ -3,6 +3,7 @@ package io.renren.modules.sales.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,35 +24,55 @@ public class SaleSellerFeeServiceImpl extends ServiceImpl<SaleSellerFeeDao, Sale
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        IPage<SaleSellerFeeEntity> page = this.page(new Query<SaleSellerFeeEntity>().getPage(params),
                new QueryWrapper<SaleSellerFeeEntity>());
        Integer year = 0;
        Integer month = 0;
        String yearMonth = params.containsKey("yearMonth") ? (String) params.get("yearMonth") : null;
        if (StringUtils.isNotBlank(yearMonth)) {
            String[] year_month = yearMonth.split("-");
            year = Integer.parseInt(year_month[0]);
            month = Integer.parseInt(year_month[1]);
        }
        IPage<SaleSellerFeeEntity> page = baseMapper.queryPage(new Query<SaleSellerFeeEntity>().getPage(params),
                new QueryWrapper<SaleSellerFeeEntity>().eq(year != 0, "year", year).eq(month != 0, "month", month));
        return new PageUtils(page);
    }
    @Override
    public void saveSellerFee(SaleSellerFeeEntity sellerFee) {
        if (sellerFee.getYear() == null || sellerFee.getYear() == 0 || sellerFee.getMonth() == null
                || sellerFee.getMonth() == 0) {
    public void saveSellerFee(SaleSellerFeeEntity saleSellerFee) {
        if (StringUtils.isBlank(saleSellerFee.getYearMonth())) {
            throw new RRException("年月不可为空");
        }
        SaleSellerFeeEntity otherFee = this.getOne(new QueryWrapper<SaleSellerFeeEntity>().eq("seller_id",
                sellerFee.getSellerId()).eq("year", sellerFee.getYear()).eq("month", sellerFee.getMonth()));
        String[] year_month = saleSellerFee.getYearMonth().split("-");
        Integer year = Integer.parseInt(year_month[0]);
        Integer month = Integer.parseInt(year_month[1]);
        saleSellerFee.setYear(year);
        saleSellerFee.setMonth(month);
        if (otherFee == null) {
            this.save(sellerFee);
        if (saleSellerFee.getId() != 0L) {
            this.updateById(saleSellerFee);
        } else {
            otherFee.setOtherFee(sellerFee.getOtherFee());
            otherFee.setOverdraft(sellerFee.getOverdraft());
            this.updateById(otherFee);
        }
            SaleSellerFeeEntity oldFee = this.getOne(new QueryWrapper<SaleSellerFeeEntity>().eq(year != 0, "year", year)
                    .eq(month != 0, "month", month).eq("seller_id", saleSellerFee.getSellerId()));
            if (oldFee == null) {
                saleSellerFee.setCreateTime(new Date());
                this.save(saleSellerFee);
            } else {
                oldFee.setOtherFee(saleSellerFee.getOtherFee());
                oldFee.setOverdraft(saleSellerFee.getOverdraft());
                
                this.updateById(oldFee);
            }
        }
    }
    @Override
    public List<SaleSellerFeeEntity> queryMonthList(Map<String, Object> params) {
        
        Integer year = 0;
        Integer month = 0;
        String yearMonth = (String) params.get("yearMonth");
@@ -60,7 +81,7 @@ public class SaleSellerFeeServiceImpl extends ServiceImpl<SaleSellerFeeDao, Sale
            year = Integer.parseInt(year_month[0]);
            month = Integer.parseInt(year_month[1]);
        }
        
        return this.list(new QueryWrapper<SaleSellerFeeEntity>().eq("year", year).eq("month", month));
    }