admin
2019-03-13 33b4ed2bbf28ec16b66e552680f56a691a4e908d
清除HongBaoMapper
2个文件已删除
1 文件已重命名
28个文件已修改
1125 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/HongBaoManageAdminController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java 289 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dto/HongBao.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoExtra.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/MoneyRecord.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/money/AccountDetailHongBaoMap.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/taobao/OrderItemHongBao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoOrderHongBao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoMapper.xml 665 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/AccountDetailsHongBaoMapServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleGiftServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShareManageServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleGiftService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShareManageService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/HongBaoManageAdminController.java
@@ -12,7 +12,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoManage;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.tag.PageEntity;
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -34,6 +34,7 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.entity.AppVersionInfo;
@@ -42,7 +43,6 @@
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoDao.java
@@ -3,7 +3,7 @@
import org.springframework.stereotype.Repository;
import com.yeshi.fanli.dao.BaseDao;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
@Repository
public class HongBaoDao extends BaseDao<HongBao> {
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dto/HongBao.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBao.java
@@ -1,20 +1,13 @@
package com.yeshi.fanli.entity.bus.user;
package com.yeshi.fanli.dto;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
 * 红包
@@ -22,9 +15,6 @@
 * @author Administrator
 *
 */
@Entity
@Table(name = "yeshi_ec_hongbao")
@org.yeshi.utils.mybatis.Table("yeshi_ec_hongbao")
public class HongBao {
    // 状态编号 1-未到时间不可领取 2-可领取 3-已经领取 4-红包失效
    public final static int STATE_BUKELINGQU = 1;
@@ -55,96 +45,60 @@
    // 分享商品得来的红包
    public final static int TYPE_SHARE_GOODS = 20;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id")
    @org.yeshi.utils.mybatis.Column(name = "id")
    @Expose
    private Long id;
    @org.yeshi.utils.mybatis.Column(name = "uid")
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "`uid`")
    private UserInfo userInfo;
    @org.yeshi.utils.mybatis.Column(name = "auctionId")
    private Long auctionId;
    @org.yeshi.utils.mybatis.Column(name = "payMoney")
    @Expose
    private BigDecimal payMoney;
    /**
     * 分销红包对应的最上级红包
     */
    @org.yeshi.utils.mybatis.Column(name = "pid")
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "`pid`")
    private HongBao parent;
    @org.yeshi.utils.mybatis.Column(name = "money")
    @Expose
    @Column(name = "money")
    private BigDecimal money;
    @org.yeshi.utils.mybatis.Column(name = "param")
    @Column(name = "param", length = 1024)
    private String param;// type对应的参数
    @org.yeshi.utils.mybatis.Column(name = "type")
    @Column(name = "`type`")
    @Expose
    private Integer type;// 1-淘宝订单 2-京东订单 3-活动红包 4-新人红包 5.邀请好友红包(布心街的) 6.一级分销红包
                            // 7.二级分销红包 20-分享商品订单
    @org.yeshi.utils.mybatis.Column(name = "state")
    @Expose
    private Integer state;// 状态编号 1-未到时间不可领取 2-可领取 3-已经领取 4-红包失效
    @org.yeshi.utils.mybatis.Column(name = "createtime")
    @Expose
    private Long createtime;// 红包创建时间
    @org.yeshi.utils.mybatis.Column(name = "pre_get_time")
    @Expose
    @Column(name = "pre_get_time")
    private Long preGettime;// 预计领取的时间
    @org.yeshi.utils.mybatis.Column(name = "get_time")
    @Column(name = "get_time")
    @Expose
    private Long getTime;// 领取的时间
    @org.yeshi.utils.mybatis.Column(name = "get_ip")
    @Expose
    @Column(name = "get_ip", length = 30)
    private String getIp;// 领取的ip
    @org.yeshi.utils.mybatis.Column(name = "beizhu")
    @Expose
    @Column(name = "beizhu", length = 1024)
    private String beizhu;
    @org.yeshi.utils.mybatis.Column(name = "order_id")
    @Expose
    @Column(name = "order_id")
    private String orderId; // yes订单ID
    // 子订单的ID,只针对直接购买商品产生的红包有效
    @org.yeshi.utils.mybatis.Column(name = "order_item_id")
    @Column(name = "order_item_id")
    private Long orderItemId;
    @org.yeshi.utils.mybatis.Column(name = "oid")
    @Expose
    @ManyToOne(fetch = FetchType.EAGER)
    @JoinColumn(name = "oid")
    private Order order;
    /**
     * 红包拥有者的rank
     */
    @org.yeshi.utils.mybatis.Column(name = "urank")
    private Integer urank;
    public HongBao() {
@@ -155,14 +109,10 @@
        this.id = id;
    }
    @org.yeshi.utils.mybatis.Column(name = "hasChild")
    private Boolean hasChild;
    @org.yeshi.utils.mybatis.Column(name = "version")
    private Integer version;
    @org.yeshi.utils.mybatis.Column(name = "balance_time")
    @Column(name = "balance_time")
    private Date balanceTime;
    @Transient // 分享邀请金额总额
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoExtra.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.entity.bus.user;
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.dto.HongBao;
//包装hongbao
public class HongBaoExtra extends HongBao{
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/MoneyRecord.java
@@ -13,6 +13,7 @@
import javax.persistence.Table;
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.dto.HongBao;
/**
 * 老的(1.2.3v之前)明细
fanli/src/main/java/com/yeshi/fanli/entity/money/AccountDetailHongBaoMap.java
@@ -5,7 +5,7 @@
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
/**
 * 账户明细与红包映射记录
fanli/src/main/java/com/yeshi/fanli/entity/taobao/OrderItemHongBao.java
@@ -1,6 +1,6 @@
package com.yeshi.fanli.entity.taobao;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.OrderItem;
public class OrderItemHongBao {
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoOrderHongBao.java
@@ -1,6 +1,6 @@
package com.yeshi.fanli.entity.taobao;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
public class TaobaoOrderHongBao {
    public HongBao hongBao;
fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoMapper.xml
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -14,7 +14,6 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
@@ -33,8 +32,7 @@
    @Resource
    private HongBaoV2CountMapper hongBaoV2CountMapper;
    @Resource
    private HongBaoMapper hongBaoMapper;
    @Resource
    private TaoBaoOrderMapper taoBaoOrderMapper;
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareServiceImpl.java
@@ -10,7 +10,7 @@
import com.yeshi.fanli.dao.hongbao.HongBaoDao;
import com.yeshi.fanli.dao.mybatis.share.ShareMapper;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.ShareTaoPassword;
import com.yeshi.fanli.service.inter.goods.ShareService;
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/AccountDetailsHongBaoMapServiceImpl.java
@@ -9,7 +9,7 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.money.AccountDetailHongBaoMapMapper;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.money.AccountDetailHongBaoMap;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -16,7 +16,6 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
@@ -24,9 +23,9 @@
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -62,9 +61,6 @@
    @Resource
    private HongBaoV2Mapper hongBaoV2Mapper;
    @Resource
    private HongBaoMapper hongBaoMapper;
    @Resource
    private TaoBaoOrderMapper taoBaoOrderMapper;
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleGiftServiceImpl.java
@@ -11,7 +11,7 @@
import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.user.ThreeSaleGiftDao;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.ThreeSaleGift;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -23,14 +23,13 @@
import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
@@ -85,8 +84,6 @@
    @Resource
    private OrderItemMapper orderItemMapper;
    @Resource
    private HongBaoMapper hongBaoMapper;
    @Resource
    private HongBaoManageMapper hongBaoManageMapper;
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -28,17 +28,16 @@
import com.yeshi.fanli.dao.mybatis.PayInfoMapper;
import com.yeshi.fanli.dao.mybatis.SystemMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.user.AccountMessageDao;
import com.yeshi.fanli.dao.user.ExtractDao;
import com.yeshi.fanli.dao.user.ExtractRecordDao;
import com.yeshi.fanli.dao.user.MoneyRecordDao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.PayInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -125,9 +124,6 @@
    @Resource
    private SystemMapper systemMapper;
    @Resource
    private HongBaoMapper hongBaoMapper;
    @Resource
    private HongBaoV2Mapper hongBaoV2Mapper;
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShareManageServiceImpl.java
@@ -16,7 +16,7 @@
import com.yeshi.fanli.dao.hongbao.HongBaoDao;
import com.yeshi.fanli.dao.user.ShareManageDao;
import com.yeshi.fanli.dao.user.UserInfoDao;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.ShareManage;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -25,16 +25,12 @@
import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
import com.yeshi.fanli.dao.mybatis.UserConnectHistoryMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.LoginResult;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
@@ -69,9 +65,6 @@
    @Resource
    private UserConnectHistoryMapper userConnectHistoryMapper;
    @Resource
    private HongBaoMapper hongBaoMapper;
    @Resource
    private OrderMapper orderMapper;
@@ -551,42 +544,8 @@
        userInfoMapper.connectUser(mainUser.getId(), lessUser.getId());
        // 查询是否有多余的新人红包
        List<HongBao> list = hongBaoMapper.selectByUidAndType(mainUser.getId(), HongBao.TYPE_XINREN);
        int subCount = 0;
        int addCount = 0;
        for (HongBao hb : list) {
            if (hb.getMoney().compareTo(new BigDecimal(0)) > 0)
                addCount++;
            if (hb.getMoney().compareTo(new BigDecimal(0)) < 0)
                subCount++;
        }
        // 有2个或者2个以上的新人红包
        if (addCount - subCount > 1) {
            // 扣除一个新人红包
            // TODO 扣除新人红包操作
            AccountMessage accountMessage = new AccountMessage();
            accountMessage.setContent(" 账号合并扣除重复新人红包" + list.get(1).getMoney().toString() + "元");
            accountMessage.setCreateTime(System.currentTimeMillis());
            accountMessage.setIsOpen(false);
            accountMessage.setSystemMsgId(0);
            accountMessage.setTitle(" 账号合并扣除重复新人红包");
            accountMessage.setUserInfo(mainUser);
            accountMessageMapper.insertSelective(accountMessage);
            userInfoMapper.subHongBaoByUid(mainUser.getId(), list.get(1).getMoney());
            HongBao hongBao = new HongBao(mainUser, new BigDecimal(0).subtract(list.get(1).getMoney()), null,
                    HongBao.TYPE_XINREN, HongBao.STATE_YILINGQU, System.currentTimeMillis(), System.currentTimeMillis(),
                    System.currentTimeMillis(), null, "账号合并扣除");
            hongBaoMapper.insertSelective(hongBao);
            MoneyRecord moneyRecord = new MoneyRecord(mainUser, hongBao, list.get(1).getMoney(), "账号合并扣除重复新人红包", "账号合并",
                    System.currentTimeMillis(), 2);
            moneyRecordMapper.insertSelective(moneyRecord);
        }
        userAccountMsgNotificationService.connectSuccess(mainUser.getId(), lessUser.getId());
    }
@@ -878,8 +837,6 @@
        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
        // TODO 备份资金明细
        // 备份红包信息
        List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid);
        // 备份订单,子订单信息
        List<Order> orderList = orderMapper.selectByUid(uid);
        List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);
@@ -895,9 +852,6 @@
            fw.write("#UserInfo" + "\r\n");
            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(user) + "\r\n");
            fw.write("#HongBao" + "\r\n");
            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(hongBaoList) + "\r\n");
            fw.write("#Order" + "\r\n");
            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderList) + "\r\n");
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
@@ -10,9 +10,9 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsGroupMapper;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareService.java
@@ -2,7 +2,7 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.ShareTaoPassword;
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
@@ -6,8 +6,8 @@
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.HongBaoException;
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleGiftService.java
@@ -2,7 +2,7 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.ThreeSaleGift;
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShareManageService.java
@@ -1,6 +1,6 @@
package com.yeshi.fanli.service.inter.user;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
public interface ShareManageService {
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java
@@ -2,8 +2,8 @@
import java.util.List;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
public interface UserShareGoodsGroupService {
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -13,9 +13,9 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.qcloud.cmq.Message;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.push.PushQueueRecord;
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -7,7 +7,7 @@
import java.util.List;
import java.util.Map;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.taobao.OrderItemHongBao;
fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java
@@ -4,9 +4,9 @@
import java.text.MessageFormat;
import java.util.Map;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.PropertiesUtil;
fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
@@ -7,8 +7,8 @@
import org.springframework.stereotype.Component;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
@@ -4,9 +4,9 @@
import java.util.Calendar;
import java.util.Date;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;