分享订单奖励 计算说明

yj

2020-03-14 a4e4101f3e68aaaeea3e280ad89b20818f40f534

分享订单奖励 计算说明

 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -181,6 +181,9 @@
    
    evaluateEmojis("evaluate_emojis", "发圈评论Emojis"),
    evaluateText("evaluate_text", "发圈评论文本"),
	
	
    shareOrderRebateDescLink("share_order_rebate_desc_link", "分享订单返利计算说明链接"),
    ;

    private final String key;

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -38,6 +38,7 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
@@ -293,11 +294,15 @@
        boolean vip = userVIPInfoService.isVIP(uid);
        // 是否存在奖励券
        boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);

        long nowTime = java.lang.System.currentTimeMillis();
        for (CommonOrderVO order : listOrder) {
            String orderNo = order.getOrderNo();
            Integer sourceType = order.getSourceType();

            Integer hongBaoType = order.getHongBaoType();
			
			
            BigDecimal totalPay = new BigDecimal(0);
            BigDecimal totalActual = new BigDecimal(0);
            // 商品信息组合
            for (CommonOrderVO commonOrder : listGoods) {
                CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
@@ -327,7 +332,16 @@
                    }
                    commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);

                    Integer hongBaoType = order.getHongBaoType();
                    totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
					
                    // 商品价格
                    BigDecimal actualPrice = commonGoodsVO.getActualPrice();
                    if (actualPrice != null) {
                        Integer totalCount = commonOrder.getTotalCount();
                        totalActual = MoneyBigDecimalUtil.add(totalActual, 
                                MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
                    }
					
                    // 邀请订单信息保护
                    if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
                            || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -354,11 +368,19 @@
                    order.getListOrderGoods().add(commonGoodsVO);
                }
            }

			
            Date thirdCreateTime = order.getThirdCreateTime();
            if (thirdCreateTime != null) {
                order.setDownTime("下单时间：" + format.format(thirdCreateTime));
                order.setObtainTime(thirdCreateTime.getTime());
            order.setDownTime("下单时间：" + format.format(thirdCreateTime));
            order.setObtainTime(thirdCreateTime.getTime());
			
            // 2.1分享订单和返利订单实付金额大于或者小于券后价的时候，订单页面 只显示3天 下单时间开始
            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
                if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType 
                        && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
                        && totalPay.compareTo(totalActual) != 0) {
                    order.setFanliDesc("由实付金额*返利比计算而来");
                    order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
                }
            }

            Date settleTime = order.getSettleTime();
@@ -446,7 +468,6 @@
            // 订单标识
            List<String> signList = new ArrayList<String>();
            /* 订单返利类型 转换 */
            Integer hongBaoType = order.getHongBaoType();
            if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
                // 自购
                hongbaoInfo = "返利";

 fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java

@@ -98,6 +98,14 @@
            return false;

    }



    public static boolean greaterThan_2_1(String platform, String versionCode) {

        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 56))

                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 78)))

            return true;

        else

            return false;

    }

	
    public static boolean smallerThan_1_5_1(String platform, String versionCode) {

        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 36))

                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 44)))


 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java

@@ -127,6 +127,11 @@
    

    @Expose

    private String vipOrderDesc;// 超级订单描述

	
    @Expose

    private String fanliDesc;// 返利说明

    @Expose

    private String fanliDescLink;// 返利说明链接





    public String getVipOrderDesc() {

@@ -432,4 +437,21 @@
    public void setSubsidyList(List<String> subsidyList) {

        this.subsidyList = subsidyList;

    }



    public String getFanliDesc() {

        return fanliDesc;

    }



    public void setFanliDesc(String fanliDesc) {

        this.fanliDesc = fanliDesc;

    }



    public String getFanliDescLink() {

        return fanliDescLink;

    }



    public void setFanliDescLink(String fanliDescLink) {

        this.fanliDescLink = fanliDescLink;

    }

	
}