添加结算相关的表

src/main/java/com/lanren/huhu/partner/PartnerApplication.java

@@ -33,8 +33,6 @@ public class PartnerApplication extends SpringBootServletInitializer {
                     logger.error(e.getMessage(), e);
                 }
             }
-
-
         } catch (Exception e) {
             logger.error("PartnerApplication>>服务启动失败", e);
             e.printStackTrace();

src/main/java/com/lanren/huhu/partner/dao/AgentBankCardMapper.java

+package com.lanren.huhu.partner.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanren.huhu.partner.domain.AgentBankCard;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface AgentBankCardMapper extends BaseMapper<AgentBankCard> {
+    int updateBatch(List<AgentBankCard> list);
+
+    int batchInsert(@Param("list") List<AgentBankCard> list);
+
+    int insertOrUpdate(AgentBankCard record);
+
+    int insertOrUpdateSelective(AgentBankCard record);
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/dao/AgentSalaryMapper.java

+package com.lanren.huhu.partner.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanren.huhu.partner.domain.AgentSalary;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface AgentSalaryMapper extends BaseMapper<AgentSalary> {
+    int updateBatch(List<AgentSalary> list);
+
+    int batchInsert(@Param("list") List<AgentSalary> list);
+
+    int insertOrUpdate(AgentSalary record);
+
+    int insertOrUpdateSelective(AgentSalary record);
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/dao/PartnerAccountLogMapper.java

+package com.lanren.huhu.partner.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanren.huhu.partner.domain.PartnerAccountLog;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface PartnerAccountLogMapper extends BaseMapper<PartnerAccountLog> {
+    int updateBatch(List<PartnerAccountLog> list);
+
+    int batchInsert(@Param("list") List<PartnerAccountLog> list);
+
+    int insertOrUpdate(PartnerAccountLog record);
+
+    int insertOrUpdateSelective(PartnerAccountLog record);
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/dao/PartnerRewardMapper.java

+package com.lanren.huhu.partner.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanren.huhu.partner.domain.PartnerReward;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface PartnerRewardMapper extends BaseMapper<PartnerReward> {
+    int updateBatch(List<PartnerReward> list);
+
+    int batchInsert(@Param("list") List<PartnerReward> list);
+
+    int insertOrUpdate(PartnerReward record);
+
+    int insertOrUpdateSelective(PartnerReward record);
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/AgentBankCard.java

+package com.lanren.huhu.partner.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+@TableName(value = "agent_bank_card")
+public class AgentBankCard implements Serializable {
+    /**
+     * 主键id
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 代理商id
+     */
+    @TableField(value = "agent_id")
+    private Integer agentId;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private Integer userId;
+
+    /**
+     * 姓名
+     */
+    @TableField(value = "real_name")
+    private String realName;
+
+    /**
+     * 用户名称
+     */
+    @TableField(value = "user_phone")
+    private String userPhone;
+
+    /**
+     * 币种编号 CNY人民币
+     */
+    @TableField(value = "currency_code")
+    private String currencyCode;
+
+    /**
+     * 绑卡类型 个人or企业 10个人 20企业
+     */
+    @TableField(value = "bank_type")
+    private Integer bankType;
+
+    /**
+     * 银行code
+     */
+    @TableField(value = "bank_code")
+    private String bankCode;
+
+    /**
+     * 银行名称
+     */
+    @TableField(value = "bank_name")
+    private String bankName;
+
+    /**
+     * 开户名称 个人姓名 企业 公司名称
+     */
+    @TableField(value = "bank_account")
+    private String bankAccount;
+
+    /**
+     * 银行卡号
+     */
+    @TableField(value = "bank_card_number")
+    private String bankCardNumber;
+
+    /**
+     * 支行名称
+     */
+    @TableField(value = "branch_name")
+    private String branchName;
+
+    /**
+     * 银行所属省份
+     */
+    @TableField(value = "bank_province")
+    private Integer bankProvince;
+
+    /**
+     * 银行所属城市
+     */
+    @TableField(value = "bank_city")
+    private Integer bankCity;
+
+    /**
+     * 银行地址信息 省市
+     */
+    @TableField(value = "bank_address")
+    private String bankAddress;
+
+    /**
+     * 银行卡状态 默认100正常 99 禁用
+     */
+    @TableField(value = "bank_state")
+    private Integer bankState;
+
+    /**
+     * 证件号 身份证
+     */
+    @TableField(value = "idcard_no")
+    private String idcardNo;
+
+    /**
+     * 身份证正面
+     */
+    @TableField(value = "idcard_pic_front")
+    private String idcardPicFront;
+
+    /**
+     * 身份证反面
+     */
+    @TableField(value = "idcard_pic_back")
+    private String idcardPicBack;
+
+    /**
+     * 营业执照或手持身份证照片
+     */
+    @TableField(value = "business_license")
+    private String businessLicense;
+
+    /**
+     * 企业税号
+     */
+    @TableField(value = "tax_number")
+    private String taxNumber;
+
+    /**
+     * 公司地址
+     */
+    @TableField(value = "company_address")
+    private String companyAddress;
+
+    /**
+     * 公司联系电话
+     */
+    @TableField(value = "company_phone")
+    private String companyPhone;
+
+    /**
+     * 税起征点 大于多少开始计算税
+     */
+    @TableField(value = "quota_node")
+    private BigDecimal quotaNode;
+
+    /**
+     * 税率
+     */
+    @TableField(value = "tax_rate")
+    private BigDecimal taxRate;
+
+    /**
+     * 开始使用时间
+     */
+    @TableField(value = "start_time")
+    private Integer startTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created_at")
+    private Integer createdAt;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updated_at")
+    private Integer updatedAt;
+
+    /**
+     * 删除信息
+     */
+    @TableField(value = "deleted_at")
+    private Integer deletedAt;
+
+    /**
+     * 默认值 100 默认 99否
+     */
+    @TableField(value = "is_default")
+    private Integer isDefault;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_AGENT_ID = "agent_id";
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_REAL_NAME = "real_name";
+
+    public static final String COL_USER_PHONE = "user_phone";
+
+    public static final String COL_CURRENCY_CODE = "currency_code";
+
+    public static final String COL_BANK_TYPE = "bank_type";
+
+    public static final String COL_BANK_CODE = "bank_code";
+
+    public static final String COL_BANK_NAME = "bank_name";
+
+    public static final String COL_BANK_ACCOUNT = "bank_account";
+
+    public static final String COL_BANK_CARD_NUMBER = "bank_card_number";
+
+    public static final String COL_BRANCH_NAME = "branch_name";
+
+    public static final String COL_BANK_PROVINCE = "bank_province";
+
+    public static final String COL_BANK_CITY = "bank_city";
+
+    public static final String COL_BANK_ADDRESS = "bank_address";
+
+    public static final String COL_BANK_STATE = "bank_state";
+
+    public static final String COL_IDCARD_NO = "idcard_no";
+
+    public static final String COL_IDCARD_PIC_FRONT = "idcard_pic_front";
+
+    public static final String COL_IDCARD_PIC_BACK = "idcard_pic_back";
+
+    public static final String COL_BUSINESS_LICENSE = "business_license";
+
+    public static final String COL_TAX_NUMBER = "tax_number";
+
+    public static final String COL_COMPANY_ADDRESS = "company_address";
+
+    public static final String COL_COMPANY_PHONE = "company_phone";
+
+    public static final String COL_QUOTA_NODE = "quota_node";
+
+    public static final String COL_TAX_RATE = "tax_rate";
+
+    public static final String COL_START_TIME = "start_time";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_CREATED_AT = "created_at";
+
+    public static final String COL_UPDATED_AT = "updated_at";
+
+    public static final String COL_DELETED_AT = "deleted_at";
+
+    public static final String COL_IS_DEFAULT = "is_default";
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/AgentSalary.java

+package com.lanren.huhu.partner.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+@TableName(value = "agent_salary")
+public class AgentSalary implements Serializable {
+     @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 代理商用户ID
+     */
+    @TableField(value = "user_id")
+    private Integer userId;
+
+    /**
+     * 代理商ID
+     */
+    @TableField(value = "agent_id")
+    private Integer agentId;
+
+    /**
+     * 月份
+     */
+    @TableField(value = "month")
+    private String month;
+
+    /**
+     * 总金额
+     */
+    @TableField(value = "balance")
+    private BigDecimal balance;
+
+    /**
+     * 开卡奖励金额
+     */
+    @TableField(value = "opencard_balance")
+    private BigDecimal opencardBalance;
+
+    /**
+     * 充值奖励金额
+     */
+    @TableField(value = "recharge_balance")
+    private BigDecimal rechargeBalance;
+
+    /**
+     * 购买VIP会员奖励金额
+     */
+    @TableField(value = "upgrade_balance")
+    private BigDecimal upgradeBalance;
+
+    /**
+     * 购买超级VIP会员奖励金额
+     */
+    @TableField(value = "upgrade_super_balance")
+    private BigDecimal upgradeSuperBalance;
+
+    /**
+     * 缴税金额
+     */
+    @TableField(value = "tax_balance")
+    private BigDecimal taxBalance;
+
+    /**
+     * 姓名或许公司名称
+     */
+    @TableField(value = "bank_account")
+    private String bankAccount;
+
+    /**
+     * 卡号
+     */
+    @TableField(value = "bank_card_number")
+    private String bankCardNumber;
+
+    /**
+     * 银行名称
+     */
+    @TableField(value = "bank_name")
+    private String bankName;
+
+    /**
+     * 支行名称
+     */
+    @TableField(value = "branch_name")
+    private String branchName;
+
+    /**
+     * 关联的银行绑定id
+     */
+    @TableField(value = "reference_id")
+    private Long referenceId;
+
+    /**
+     * 状态 10待提现 20已提现
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 提现时间
+     */
+    @TableField(value = "modify_time")
+    private LocalDateTime modifyTime;
+
+    @TableField(value = "created_at")
+    private Long createdAt;
+
+    @TableField(value = "updated_at")
+    private Long updatedAt;
+
+    @TableField(value = "deleted_at")
+    private Long deletedAt;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_AGENT_ID = "agent_id";
+
+    public static final String COL_MONTH = "month";
+
+    public static final String COL_BALANCE = "balance";
+
+    public static final String COL_OPENCARD_BALANCE = "opencard_balance";
+
+    public static final String COL_RECHARGE_BALANCE = "recharge_balance";
+
+    public static final String COL_UPGRADE_BALANCE = "upgrade_balance";
+
+    public static final String COL_UPGRADE_SUPER_BALANCE = "upgrade_super_balance";
+
+    public static final String COL_TAX_BALANCE = "tax_balance";
+
+    public static final String COL_BANK_ACCOUNT = "bank_account";
+
+    public static final String COL_BANK_CARD_NUMBER = "bank_card_number";
+
+    public static final String COL_BANK_NAME = "bank_name";
+
+    public static final String COL_BRANCH_NAME = "branch_name";
+
+    public static final String COL_REFERENCE_ID = "reference_id";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_MODIFY_TIME = "modify_time";
+
+    public static final String COL_CREATED_AT = "created_at";
+
+    public static final String COL_UPDATED_AT = "updated_at";
+
+    public static final String COL_DELETED_AT = "deleted_at";
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/PartnerAccountLog.java

+package com.lanren.huhu.partner.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+@TableName(value = "partner_account_log")
+public class PartnerAccountLog implements Serializable {
+     @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private Integer userId;
+
+    /**
+     * 年份
+     */
+    @TableField(value = "yeartime")
+    private Integer yeartime;
+
+    /**
+     * 月份
+     */
+    @TableField(value = "monthtime")
+    private Integer monthtime;
+
+    /**
+     * 每日日期
+     */
+    @TableField(value = "daytime")
+    private Integer daytime;
+
+    /**
+     * 变化类型 10 微信 20支付宝 30 银联 40 银行卡 、50呼呼结算、60首月奖励 、70税费、80平台服务费、90平台扣除
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 变化的金额 进账为正数 出账为负数
+     */
+    @TableField(value = "change_num")
+    private BigDecimal changeNum;
+
+    /**
+     * 变化的之后的金额
+     */
+    @TableField(value = "changed_amount")
+    private BigDecimal changedAmount;
+
+    /**
+     * 变更的当前时间戳 秒级
+     */
+    @TableField(value = "change_time")
+    private Integer changeTime;
+
+    /**
+     * 状态 20是已经处理（充值后者减值，10是待处理）
+     */
+    @TableField(value = "pay_state")
+    private Integer payState;
+
+    /**
+     * 支付平台 系统hupay、微信wxpay、支付宝 alipay 、银联支付 unionpay 、银行卡cardpay
+     */
+    @TableField(value = "pay_platform")
+    private String payPlatform;
+
+    /**
+     * 支付类型，10充值，20消费，30提现，40退款, 50合伙人奖励，60充值奖励，70 激活现金，80提现回退,90系统赠送,100系统扣除,110呼呼按月结算，120首月奖励
+     */
+    @TableField(value = "pay_type")
+    private Boolean payType;
+
+    /**
+     * 类型描述 与pay_type 对应
+     */
+    @TableField(value = "pay_remark")
+    private String payRemark;
+
+    /**
+     * 文字描述
+     */
+    @TableField(value = "pay_info")
+    private String payInfo;
+
+    /**
+     * 参考ID 就是发生变化的订单id  支付 充值 提现、奖励的主键id
+     */
+    @TableField(value = "reference_id")
+    private String referenceId;
+
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    @TableField(value = "modify_time")
+    private LocalDateTime modifyTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_YEARTIME = "yeartime";
+
+    public static final String COL_MONTHTIME = "monthtime";
+
+    public static final String COL_DAYTIME = "daytime";
+
+    public static final String COL_TYPE = "type";
+
+    public static final String COL_CHANGE_NUM = "change_num";
+
+    public static final String COL_CHANGED_AMOUNT = "changed_amount";
+
+    public static final String COL_CHANGE_TIME = "change_time";
+
+    public static final String COL_PAY_STATE = "pay_state";
+
+    public static final String COL_PAY_PLATFORM = "pay_platform";
+
+    public static final String COL_PAY_TYPE = "pay_type";
+
+    public static final String COL_PAY_REMARK = "pay_remark";
+
+    public static final String COL_PAY_INFO = "pay_info";
+
+    public static final String COL_REFERENCE_ID = "reference_id";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_MODIFY_TIME = "modify_time";
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/PartnerReward.java

+package com.lanren.huhu.partner.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+@TableName(value = "partner_reward")
+public class PartnerReward implements Serializable {
+    /**
+     * ID序号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private Integer userId;
+
+    /**
+     * 用户是否是超级
+     */
+    @TableField(value = "user_is_super")
+    private Integer userIsSuper;
+
+    /**
+     * 用户合伙人级别 普通10 高级20
+     */
+    @TableField(value = "user_partner_level")
+    private Integer userPartnerLevel;
+
+    /**
+     * 合伙人奖励类型 60 用户在线充值 70 升高开户充值,80邀请奖励,90下单奖励,100购买超级VIP会员,110购物奖励,120分享赚奖励
+     */
+    @TableField(value = "reward_type")
+    private Integer rewardType;
+
+    /**
+     * 状态 100待结算 120 已结算
+     */
+    @TableField(value = "reward_status")
+    private Integer rewardStatus;
+
+    /**
+     * 分红金额
+     */
+    @TableField(value = "commission_acount")
+    private BigDecimal commissionAcount;
+
+    /**
+     * 分红比例
+     */
+    @TableField(value = "commission_rate")
+    private BigDecimal commissionRate;
+
+    /**
+     * order id
+     */
+    @TableField(value = "reference_id")
+    private String referenceId;
+
+    /**
+     * 用户充值时间
+     */
+    @TableField(value = "recharge_time")
+    private LocalDateTime rechargeTime;
+
+    /**
+     * 面值
+     */
+    @TableField(value = "price")
+    private BigDecimal price;
+
+    /**
+     * 奖励基数(充值支付金额 或 淘宝京东原始佣金)
+     */
+    @TableField(value = "cash")
+    private BigDecimal cash;
+
+    /**
+     * 源用户id
+     */
+    @TableField(value = "source_user_id")
+    private Integer sourceUserId;
+
+    /**
+     * 源用户邀请人id
+     */
+    @TableField(value = "invite_user_id")
+    private Integer inviteUserId;
+
+    /**
+     * 源用户邀请人级别 普通10 高级20
+     */
+    @TableField(value = "invite_user_level")
+    private Integer inviteUserLevel;
+
+    /**
+     * 源原用户邀请人是否超级 1是 0否
+     */
+    @TableField(value = "invite_user_is_super")
+    private Integer inviteUserIsSuper;
+
+    @TableField(value = "created_at")
+    private Long createdAt;
+
+    @TableField(value = "updated_at")
+    private Long updatedAt;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 是直接还是间接邀请人 10直接 20间接 30自己
+     */
+    @TableField(value = "source_type")
+    private Integer sourceType;
+
+    /**
+     * 第?笔下单激活奖励
+     */
+    @TableField(value = "reward_times")
+    private Integer rewardTimes;
+
+    /**
+     * 结算状态 100在路上 200预结算 300已结算 -100在路上已失效 -200预结算已失效 -300已结算扣回
+     */
+    @TableField(value = "settle_state")
+    private Integer settleState;
+
+    /**
+     * 商品id
+     */
+    @TableField(value = "goods_id")
+    private String goodsId;
+
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+     * 订单类型
+     */
+    @TableField(value = "order_type")
+    private String orderType;
+
+    /**
+     * 订单号
+     */
+    @TableField(value = "order_sn")
+    private String orderSn;
+
+    /**
+     * 子订单号
+     */
+    @TableField(value = "sub_order_sn")
+    private String subOrderSn;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_USER_IS_SUPER = "user_is_super";
+
+    public static final String COL_USER_PARTNER_LEVEL = "user_partner_level";
+
+    public static final String COL_REWARD_TYPE = "reward_type";
+
+    public static final String COL_REWARD_STATUS = "reward_status";
+
+    public static final String COL_COMMISSION_ACOUNT = "commission_acount";
+
+    public static final String COL_COMMISSION_RATE = "commission_rate";
+
+    public static final String COL_REFERENCE_ID = "reference_id";
+
+    public static final String COL_RECHARGE_TIME = "recharge_time";
+
+    public static final String COL_PRICE = "price";
+
+    public static final String COL_CASH = "cash";
+
+    public static final String COL_SOURCE_USER_ID = "source_user_id";
+
+    public static final String COL_INVITE_USER_ID = "invite_user_id";
+
+    public static final String COL_INVITE_USER_LEVEL = "invite_user_level";
+
+    public static final String COL_INVITE_USER_IS_SUPER = "invite_user_is_super";
+
+    public static final String COL_CREATED_AT = "created_at";
+
+    public static final String COL_UPDATED_AT = "updated_at";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_SOURCE_TYPE = "source_type";
+
+    public static final String COL_REWARD_TIMES = "reward_times";
+
+    public static final String COL_SETTLE_STATE = "settle_state";
+
+    public static final String COL_GOODS_ID = "goods_id";
+
+    public static final String COL_TITLE = "title";
+
+    public static final String COL_ORDER_TYPE = "order_type";
+
+    public static final String COL_ORDER_SN = "order_sn";
+
+    public static final String COL_SUB_ORDER_SN = "sub_order_sn";
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/manager/OrderTaobaoJdCommissionManager.java

-package com.lanren.huhu.partner.manager;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;import com.lanren.huhu.partner.service.OrderTaobaoJdCommissionService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
/**
 * @author houseme
 * @date 2019-07-01 14:45
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: OrderTaobaoJdCommissionManager
 */@Componentpublic class OrderTaobaoJdCommissionManager {

    private static Logger logger = LoggerFactory.getLogger(OrderTaobaoJdCommissionManager.class);

    @Autowired
    private OrderTaobaoJdCommissionService orderTaobaoJdCommissionService;

    public void one() {
        QueryWrapper<OrderTaobaoJdCommission> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("order_sn", "511853890422935938 ");
        System.out.println(queryWrapper);
        System.out.println(orderTaobaoJdCommissionService.getOne(queryWrapper));
    }}
+package com.lanren.huhu.partner.manager;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;import com.lanren.huhu.partner.service.OrderTaobaoJdCommissionService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
/**
 * @author houseme
 * @date 2019-07-01 14:45
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: OrderTaobaoJdCommissionManager
 */@Componentpublic class OrderTaobaoJdCommissionManager {

    private static Logger logger = LoggerFactory.getLogger(OrderTaobaoJdCommissionManager.class);

    @Autowired
    private OrderTaobaoJdCommissionService orderTaobaoJdCommissionService;

    public void one() {
        QueryWrapper<OrderTaobaoJdCommission> queryWrapper = new QueryWrapper<OrderTaobaoJdCommission>();
        queryWrapper.eq("order_sn", "511853890422935938 ");
        System.out.println(queryWrapper);
        System.out.println(orderTaobaoJdCommissionService.getOne(queryWrapper));
    }}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/schedule/AgentRewardQueueTask.java

@@ -60,7 +60,7 @@ public class AgentRewardQueueTask {
         logger.info("run AgentRewardQueueTask done");
     }
 
-    public void runConsume() {
+    private void runConsume() {
         ListOperations<String, String> ops = stringRedisTemplate.opsForList();
         while(null != ops && null != ops.size(AGENT_REWARD_QUEUE_KEY) && ops.size(AGENT_REWARD_QUEUE_KEY) > 0L) {
             String msg = "";
@@ -77,7 +77,6 @@ public class AgentRewardQueueTask {
                 } finally{
                     LockUtil.unlock(DISTRIBUTE_REDIS_LOCK_KEY);
                 }
-
                 logger.info("msg is {}", msg);
                 JSONObject json = JSON.parseObject(msg);
                 AgentRewardMessage message = json.toJavaObject(AgentRewardMessage.class);
@@ -96,18 +95,18 @@ public class AgentRewardQueueTask {
         int rewardType = message.getRewardType();
         Map<Integer, BigDecimal> rateMap;
         if (!AGENT_RATE_MAP.keySet().contains(rewardType)) {
-            logger.error("未知的奖励类型 跳过不处理: {}", message);
+            logger.info("未知的奖励类型 跳过不处理: {}", message);
             return;
         } else {
             rateMap = AGENT_RATE_MAP.get(rewardType);
         }
         UserAgent userAgent = userAgentService.getOneByAgentId(message.getAgentId());
         if (userAgent == null) {
-            logger.error("代理商id: {} 不存在, 跳过不处理", message);
+            logger.info("代理商id: {} 不存在, 跳过不处理", message);
             return;
         }
         if (userAgent.getAgentLevel() != AGENT_LEVEL_4) {
-            logger.error("代理商id: {} 不是城市代理, 跳过不处理", message);
+            logger.info("代理商id: {} 不是城市代理, 跳过不处理", message);
             return;
         }
         User user = userService.getRelationByUserId(userAgent.getUserId());
@@ -193,11 +192,7 @@ public class AgentRewardQueueTask {
             agentReward.setSourceOrder(message.getReferenceId());
             agentReward.setSourceUserLevel(sourceUserLevel);
             agentReward.setCreatedAt(System.currentTimeMillis() / 1000L);
-            if (agentRewardService.save(agentReward)) {
-                return true;
-            } else {
-                return false;
-            }
+            return agentRewardService.save(agentReward);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             return false;

src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java

+package com.lanren.huhu.partner.schedule;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author chen
+ * @title: PartnerSettleTask
+ * @projectName partner
+ * @description: TODO
+ * @package com.lanren.huhu.partner.schedule
+ * @date 2019-07-02 15:45
+ */
+@Component
+public class PartnerSettleTask {
+    private static Logger logger = LoggerFactory.getLogger(PartnerSettleTask.class);
+
+}

src/main/java/com/lanren/huhu/partner/service/AgentBankCardService.java

+package com.lanren.huhu.partner.service;
+
+import java.util.List;
+import com.lanren.huhu.partner.domain.AgentBankCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:59
+    */
+public interface AgentBankCardService extends IService<AgentBankCard>{
+
+
+    int updateBatch(List<AgentBankCard> list);
+
+    int batchInsert(List<AgentBankCard> list);
+
+    int insertOrUpdate(AgentBankCard record);
+
+    int insertOrUpdateSelective(AgentBankCard record);
+
+}

src/main/java/com/lanren/huhu/partner/service/AgentSalaryService.java

+package com.lanren.huhu.partner.service;
+
+import java.util.List;
+import com.lanren.huhu.partner.domain.AgentSalary;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:57
+    */
+public interface AgentSalaryService extends IService<AgentSalary>{
+
+
+    int updateBatch(List<AgentSalary> list);
+
+    int batchInsert(List<AgentSalary> list);
+
+    int insertOrUpdate(AgentSalary record);
+
+    int insertOrUpdateSelective(AgentSalary record);
+
+}

src/main/java/com/lanren/huhu/partner/service/PartnerAccountLogService.java

+package com.lanren.huhu.partner.service;
+
+import java.util.List;
+import com.lanren.huhu.partner.domain.PartnerAccountLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:57
+    */
+public interface PartnerAccountLogService extends IService<PartnerAccountLog>{
+
+
+    int updateBatch(List<PartnerAccountLog> list);
+
+    int batchInsert(List<PartnerAccountLog> list);
+
+    int insertOrUpdate(PartnerAccountLog record);
+
+    int insertOrUpdateSelective(PartnerAccountLog record);
+
+}

src/main/java/com/lanren/huhu/partner/service/PartnerRewardService.java

+package com.lanren.huhu.partner.service;
+
+import java.util.List;
+import com.lanren.huhu.partner.domain.PartnerReward;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 14:54
+    */
+public interface PartnerRewardService extends IService<PartnerReward>{
+
+
+    int updateBatch(List<PartnerReward> list);
+
+    int batchInsert(List<PartnerReward> list);
+
+    int insertOrUpdate(PartnerReward record);
+
+    int insertOrUpdateSelective(PartnerReward record);
+
+}

src/main/java/com/lanren/huhu/partner/service/UserService.java

-package com.lanren.huhu.partner.service;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.domain.UserAgent;import com.lanren.huhu.partner.model.ParentAgent;import com.lanren.huhu.partner.model.ParentPartner;import com.lanren.huhu.partner.model.User;
import java.util.List;
/**
 * @author houseme
 * @date 2019-06-28 18:35
 * @Project partner
 * @Package com.lanren.huhu.partner.service
 * @File: UserService
 */public interface UserService {

    /**
     * @description: 根据用户id, 查找一个用户的全部合伙人上级 和 代理商上级
     *       缓存用户邀请关系和代理商关系数据
     *       缓存不能带有构造方法的Bean 所以只能返回User的Bean
     *       包装Result在Cacheable注解的方法之外进行操作
     * @param userId
     * @return User
     * @throws
     * @author chen
     * @date 2019-06-26 20:01
     */
    User getRelationByUserId(Integer userId);
    /**
     * 清理用户缓存
     */
    boolean deleteRalationByUserId(Integer userId);

    /***
     * PartnerAccount
     *
     * 根据用户id查询账户信息
     * @param userId
     * @return PartnerAccount
     */
    PartnerAccount getPartnerAccountByUserId(Integer userId);
    /**
     * @description: TODO
     * @param userId
     * @return List<PartnerAccount>
     * @author chen
     * @date 2019-06-28 11:49
     */
    List<PartnerAccount> getPartnerAccountChildrenByUserId(Integer userId);

    /***
     * UserAgent
     * 根据用户id查询账户信息
     * @param userId
     * @return
     */
    UserAgent getUserAgentByUserId(Integer userId);

    /**
     * 按userId查找上级合伙人的 userId 和 level
     * @param userId
     * @return
     */
    ParentPartner getParentPartner(Integer userId);

    /**
     * @description: 查找一个用户的全部合伙人上级, set到User对象的partnerList中
     * @param userId
     * @author chen
     * @return List<ParentPartner>
     */
    List<ParentPartner> getPartnerListByUserId(Integer userId);

    /**
     * 按agentId 查找上级代理商的 agentId 和 level
     * @param agentId
     * @return
     */
    ParentAgent getParentAgent(Integer agentId);
    /**
     * @description: 查找一个用户的全部代理商上级 set到User对象的agentList中
     * @param userId
     * @return List<ParentAgent>
     */
    List<ParentAgent> getAgentListByUserId(Integer userId);
}
+package com.lanren.huhu.partner.service;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.domain.UserAgent;import com.lanren.huhu.partner.model.User;
import java.util.List;
/**
 * @author houseme
 * @date 2019-06-28 18:35
 * @Project partner
 * @Package com.lanren.huhu.partner.service
 * @File: UserService
 */public interface UserService {

    /**
     * @description: 根据用户id, 查找一个用户的全部合伙人上级 和 代理商上级
     *       缓存用户邀请关系和代理商关系数据
     *       缓存不能带有构造方法的Bean 所以只能返回User的Bean
     *       包装Result在Cacheable注解的方法之外进行操作
     * @param userId
     * @return User
     * @throws
     * @author chen
     * @date 2019-06-26 20:01
     */
    User getRelationByUserId(Integer userId);
    /**
     * 清理用户缓存
     */
    boolean deleteRalationByUserId(Integer userId);

    /***
     * PartnerAccount
     *
     * 根据用户id查询账户信息
     * @param userId
     * @return PartnerAccount
     */
    PartnerAccount getPartnerAccountByUserId(Integer userId);
    /**
     * @description: 根据用户id查询全部下级合伙人
     * @param userId
     * @return List<PartnerAccount>
     * @author chen
     * @date 2019-06-28 11:49
     */
    List<PartnerAccount> getPartnerAccountChildrenByUserId(Integer userId);

    /***
     * UserAgent
     * 根据用户id查询账户信息
     * @param userId
     * @return
     */
    UserAgent getUserAgentByUserId(Integer userId);
//    /**
//     * 按userId查找上级合伙人的 userId 和 level
//     * @param userId
//     * @return
//     */
//    ParentPartner getParentPartner(Integer userId);

//    /**
//     * @description: 查找一个用户的全部合伙人上级, set到User对象的partnerList中
//     * @param userId
//     * @author chen
//     * @return List<ParentPartner>
//     */
//    List<ParentPartner> getPartnerListByUserId(Integer userId);

//    /**
//     * 按agentId 查找上级代理商的 agentId 和 level
//     * @param agentId
//     * @return
//     */
//    ParentAgent getParentAgent(Integer agentId);
//    /**
//     * @description: 查找一个用户的全部代理商上级 set到User对象的agentList中
//     * @param userId
//     * @return List<ParentAgent>
//     */
//    List<ParentAgent> getAgentListByUserId(Integer userId);

}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/service/impl/AgentBankCardServiceImpl.java

+package com.lanren.huhu.partner.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import com.lanren.huhu.partner.domain.AgentBankCard;
+import com.lanren.huhu.partner.dao.AgentBankCardMapper;
+import com.lanren.huhu.partner.service.AgentBankCardService;
+/**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:59
+    */
+@Service
+public class AgentBankCardServiceImpl extends ServiceImpl<AgentBankCardMapper, AgentBankCard> implements AgentBankCardService{
+
+    @Override
+    public int updateBatch(List<AgentBankCard> list) {
+        return baseMapper.updateBatch(list);
+    }
+    @Override
+    public int batchInsert(List<AgentBankCard> list) {
+        return baseMapper.batchInsert(list);
+    }
+    @Override
+    public int insertOrUpdate(AgentBankCard record) {
+        return baseMapper.insertOrUpdate(record);
+    }
+    @Override
+    public int insertOrUpdateSelective(AgentBankCard record) {
+        return baseMapper.insertOrUpdateSelective(record);
+    }
+}

src/main/java/com/lanren/huhu/partner/service/impl/AgentSalaryServiceImpl.java

+package com.lanren.huhu.partner.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import com.lanren.huhu.partner.dao.AgentSalaryMapper;
+import com.lanren.huhu.partner.domain.AgentSalary;
+import com.lanren.huhu.partner.service.AgentSalaryService;
+/**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:57
+    */
+@Service
+public class AgentSalaryServiceImpl extends ServiceImpl<AgentSalaryMapper, AgentSalary> implements AgentSalaryService{
+
+    @Override
+    public int updateBatch(List<AgentSalary> list) {
+        return baseMapper.updateBatch(list);
+    }
+    @Override
+    public int batchInsert(List<AgentSalary> list) {
+        return baseMapper.batchInsert(list);
+    }
+    @Override
+    public int insertOrUpdate(AgentSalary record) {
+        return baseMapper.insertOrUpdate(record);
+    }
+    @Override
+    public int insertOrUpdateSelective(AgentSalary record) {
+        return baseMapper.insertOrUpdateSelective(record);
+    }
+}

src/main/java/com/lanren/huhu/partner/service/impl/PartnerAccountLogServiceImpl.java

+package com.lanren.huhu.partner.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import com.lanren.huhu.partner.domain.PartnerAccountLog;
+import com.lanren.huhu.partner.dao.PartnerAccountLogMapper;
+import com.lanren.huhu.partner.service.PartnerAccountLogService;
+/**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 15:57
+    */
+@Service
+public class PartnerAccountLogServiceImpl extends ServiceImpl<PartnerAccountLogMapper, PartnerAccountLog> implements PartnerAccountLogService{
+
+    @Override
+    public int updateBatch(List<PartnerAccountLog> list) {
+        return baseMapper.updateBatch(list);
+    }
+    @Override
+    public int batchInsert(List<PartnerAccountLog> list) {
+        return baseMapper.batchInsert(list);
+    }
+    @Override
+    public int insertOrUpdate(PartnerAccountLog record) {
+        return baseMapper.insertOrUpdate(record);
+    }
+    @Override
+    public int insertOrUpdateSelective(PartnerAccountLog record) {
+        return baseMapper.insertOrUpdateSelective(record);
+    }
+}

src/main/java/com/lanren/huhu/partner/service/impl/PartnerAccountServiceImpl.java

@@ -41,7 +41,7 @@ public class PartnerAccountServiceImpl extends ServiceImpl<PartnerAccountMapper,
 
     @Override
     public PartnerAccount getOneByUserId(Integer userId) {
-        QueryWrapper<PartnerAccount> queryWrapper = new QueryWrapper();
+        QueryWrapper<PartnerAccount> queryWrapper = new QueryWrapper<PartnerAccount>();
         queryWrapper.eq("user_id", userId);
         return baseMapper.selectOne(queryWrapper);
     }

src/main/java/com/lanren/huhu/partner/service/impl/PartnerRewardServiceImpl.java

+package com.lanren.huhu.partner.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import com.lanren.huhu.partner.dao.PartnerRewardMapper;
+import com.lanren.huhu.partner.domain.PartnerReward;
+import com.lanren.huhu.partner.service.PartnerRewardService;
+/**  
+    * @title: ${NAME}
+    * @projectName partner
+    * @description: TODO
+    * @author chen
+    * @package ${PACKAGE_NAME}
+    * @date 2019-07-02 14:54
+    */
+@Service
+public class PartnerRewardServiceImpl extends ServiceImpl<PartnerRewardMapper, PartnerReward> implements PartnerRewardService{
+
+    @Override
+    public int updateBatch(List<PartnerReward> list) {
+        return baseMapper.updateBatch(list);
+    }
+    @Override
+    public int batchInsert(List<PartnerReward> list) {
+        return baseMapper.batchInsert(list);
+    }
+    @Override
+    public int insertOrUpdate(PartnerReward record) {
+        return baseMapper.insertOrUpdate(record);
+    }
+    @Override
+    public int insertOrUpdateSelective(PartnerReward record) {
+        return baseMapper.insertOrUpdateSelective(record);
+    }
+}

src/main/java/com/lanren/huhu/partner/service/impl/UserAgentServiceImpl.java

@@ -38,7 +38,7 @@ public class UserAgentServiceImpl extends ServiceImpl<UserAgentMapper, UserAgent
 
     @Override
     public UserAgent getOneByAgentId(Integer agentId) {
-        QueryWrapper<UserAgent> queryWrapper = new QueryWrapper();
+        QueryWrapper<UserAgent> queryWrapper = new QueryWrapper<UserAgent>();
         queryWrapper.eq("agent_id", agentId)
                 .le("agent_level", 4)
         ;