推广红包退回BUG

yujian

2019-07-11 c44ff90c2610ecfbb87ace8dea0d636cf07817cb

推广红包退回BUG

 fanli/src/main/java/com/yeshi/fanli/dto/msg/MsgOtherTaoLiJinContentDTO.java

@@ -12,6 +12,9 @@
    private String state;

    private String source;// 来源

    private BigDecimal money;// 面额

    private String timeDesc;// 时间说明

    private String reason;// 原因

    private String result;// 结果

    

    public String getState() {

        return state;

@@ -37,4 +40,28 @@
        this.money = money;

    }



    public String getTimeDesc() {

        return timeDesc;

    }



    public void setTimeDesc(String timeDesc) {

        this.timeDesc = timeDesc;

    }



    public String getReason() {

        return reason;

    }



    public void setReason(String reason) {

        this.reason = reason;

    }



    public String getResult() {

        return result;

    }



    public void setResult(String result) {

        this.result = result;

    }

	
}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java

@@ -16,7 +16,7 @@
public class UserTaoLiJinOrigin {



    public enum TaoLiJinOriginEnum {

        newbiesWin("新人红包"), shareWin("推广红包福利"), rankWin("账户等级福利"), inviteWin("邀请队员奖励"), refund("失效回退");

        newbiesWin("新人红包"), shareWin("推广红包福利"), rankWin("账户等级福利"), inviteWin("邀请队员奖励"), refund("未领取回退");

        

        private final String desc;




 fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinOriginMapper.xml

@@ -112,6 +112,7 @@
  <select id="getSurplusLiJin" resultMap="BaseResultMap" >
     SELECT * FROM yeshi_ec_user_taolijin_origin t
    WHERE t.`uto_uid` = #{uid} AND t.`uto_money_surplus`<![CDATA[>]]> 0
    ORDER BY t.`uto_create_time`
  </select>
  
  <select id="countByUidAndType" resultType="Long">

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java

@@ -23,6 +23,7 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;

import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;

import com.yeshi.fanli.log.LogHelper;

@@ -32,6 +33,7 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -66,6 +68,9 @@
    

    @Resource

    private UserTaoLiJinRecordService userTaoLiJinRecordService;

	
    @Resource

    private UserTaoLiJinReportService userTaoLiJinReportService;

    

    

    @Override

@@ -418,15 +423,72 @@
        

        BigDecimal total = new BigDecimal(0);

        for (UserTaoLiJinOrigin userTaoLiJinOrigin: list) {

			
            UserTaoLiJinOrigin origin = new UserTaoLiJinOrigin();

            origin.setId(userTaoLiJinOrigin.getId());

            origin.setMoneySurplus(new BigDecimal(0));

            origin.setUpdateTime(new Date());

            userTaoLiJinOriginMapper.updateByPrimaryKeySelective(origin);

            

            SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");

            String time = sd.format(userTaoLiJinOrigin.getCreateTime());

            if (origin.getOrigin().equals(TaoLiJinOriginEnum.refund)) {

                String rightsId = userTaoLiJinOrigin.getRightsId();

                UserTaoLiJinReport report = userTaoLiJinReportService.selectByPrimaryKey(rightsId);

                Date shareTime = null;

                if (report == null) {

                    shareTime = date;

                } else {

                    shareTime = report.getCreateTime();

                }

				
                // 消息

                MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

                content.setState("红包收回");

                content.setSource("于["+ sd.format(shareTime) + "]创建的分享未被领取部分");

                content.setTimeDesc("退回于" + time);

                content.setMoney(userTaoLiJinOrigin.getMoneySurplus());

                content.setReason("本笔退回推广红包从退回日起至今并未产生分享记录");

                content.setResult("长期未使用收回");

                userOtherMsgNotificationService.taoLiJinMsg(uid, "如有疑问请联系人工客服", content);

				
            } else {

                // 消息

                MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

                content.setState("红包收回");

                content.setSource(origin.getOrigin().getDesc());

                content.setTimeDesc("获得于" + time);

                content.setMoney(userTaoLiJinOrigin.getMoneySurplus());

                content.setReason("本笔推广红包从获得日起至今并未产生分享记录");

                content.setResult("长期未使用收回");

                userOtherMsgNotificationService.taoLiJinMsg(uid, "如有疑问请联系人工客服", content);

            }

			
			
            total = MoneyBigDecimalUtil.add(total, userTaoLiJinOrigin.getMoneySurplus());

        }

		
        // 用户剩余淘礼金

        UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);

        if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {

            return;

        }

		
        UserMoneyExtra updateExtra = new UserMoneyExtra();

        updateExtra.setUid(uid);

		
        BigDecimal tljSelf = userMoneyExtra.getTljSelf();

        if (tljSelf != null && tljSelf.compareTo(new BigDecimal(0)) > 0) { // 剩余淘礼金-- 自购

            BigDecimal sub = MoneyBigDecimalUtil.sub(tljSelf, total);

            if (sub.compareTo(new BigDecimal(0)) > 0) {

                updateExtra.setTljSelf(sub);

            } else {

                updateExtra.setTljSelf(new BigDecimal(0));

            }

        } 
        updateExtra.setTlj(MoneyBigDecimalUtil.sub(userMoneyExtra.getTlj(), total));

        updateExtra.setUpdateTime(new Date());

        userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);

		
        

        // 插入明细

        UserTaoLiJinDetail detail = new UserTaoLiJinDetail();

@@ -434,25 +496,8 @@
        detail.setMoney(new BigDecimal("-" + total.toString()));

        detail.setTitle(TaoLiJinDetailTypeEnum.sendBack.getDesc());

        detail.setType(TaoLiJinDetailTypeEnum.sendBack);

        detail.setCreateTime(date);

        detail.setCreateTime(new Date());

        userTaoLiJinDetailService.insertSelective(detail);

		
        // 消息

        final BigDecimal totalMoney = total;

        executor.execute(new Runnable() {

            @Override

            public void run() {

                try {

                    MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

                    content.setState("红包扣除");

                    content.setSource("15天内未产生过推广红包分享记录");

                    content.setMoney(totalMoney);

                    userOtherMsgNotificationService.taoLiJinMsg(uid, "清除后无法恢复", content);

                } catch (Exception e) {

                    LogHelper.errorDetailInfo(e);

                }

            }

        });

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java

@@ -169,4 +169,9 @@
        }

    }

    

    @Override

    public UserTaoLiJinReport selectByPrimaryKey(String id) {

        return userTaoLiJinReportMapper.selectByPrimaryKey(id);

    }

	
}


 fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinReportService.java

@@ -27,4 +27,6 @@
     *  超过3天的未领取 退回金额

     */

    public void refundNotWin();



    public UserTaoLiJinReport selectByPrimaryKey(String id);

}


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -567,6 +567,12 @@
                items.add(new CommonMsgItemVO(new ClientTextStyleVO("来源", COLOR_TITLE), contentList));

            }



            if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) {

                contentList = new ArrayList<>();

                contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT));

                items.add(new CommonMsgItemVO(new ClientTextStyleVO("时间", COLOR_TITLE), contentList));

            }



            if (dto.getMoney() != null) {

                contentList = new ArrayList<>();

                contentList.add(

@@ -574,6 +580,19 @@
                items.add(new CommonMsgItemVO(new ClientTextStyleVO("面额", COLOR_TITLE), contentList));

            }



			
            if (!StringUtil.isNullOrEmpty(dto.getReason())) {

                contentList = new ArrayList<>();

                contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));

                items.add(new CommonMsgItemVO(new ClientTextStyleVO("原因", COLOR_TITLE), contentList));

            }

			
            if (!StringUtil.isNullOrEmpty(dto.getResult())) {

                contentList = new ArrayList<>();

                contentList.add(new ClientTextStyleVO(dto.getResult() + "", COLOR_CONTENT));

                items.add(new CommonMsgItemVO(new ClientTextStyleVO("结果", COLOR_TITLE), contentList));

            }

			
            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

                    COLOR_CONTENT));