暂不到账拼多多/京东

admin

2019-08-02 26e7a03ee4be4b8de0cbfe55d6ef6a63122b2336

暂不到账拼多多/京东

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

@@ -299,6 +299,13 @@
            return;

        }



        // 灰度测试中，京东/拼多多不返利

        if (hongBaoOrder.getCommonOrder() == null

                || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD

                || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) {

            return;

        }



        if (hongBaoOrder.getCommonOrder() != null

                && hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {

            // 维权中的不返利

@@ -554,6 +561,25 @@
        types.add(HongBaoV2.TYPE_YIJI);

        types.add(HongBaoV2.TYPE_ERJI);

        List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);

        // 灰度测试中，京东/拼多多订单分享/邀请订单不返利

        for (int i = 0; i < hongBaoList.size(); i++) {

            HongBaoV2 item = hongBaoList.get(i);

            if (item.getType() == HongBaoV2.TYPE_SHARE_GOODS) {

            } else {

                item = item.getParent();

            }

            if (item != null) {

                HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());

                if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {

                    CommonOrder co = hongBaoOrder.getCommonOrder();

                    if (co.getSourceType() == Constant.SOURCE_TYPE_JD

                            || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {

                        hongBaoList.remove(i);

                        i--;

                    }

                }

            }

        }



        List<Long> hbIdList = new ArrayList<>();



@@ -736,9 +762,12 @@


                Date minDate = new Date(TimeUtil

                        .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

                long validCount =  hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);

                long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);

                long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);

                long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                        minDate, maxDate);

                long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                        minDate, maxDate);

                long invalidCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                        minDate, maxDate);



                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                        (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

@@ -951,6 +980,7 @@


    /**

     * 处理京东返利订单

     * 
     * @param jdOrder

     * @param uid

     */

@@ -1023,6 +1053,7 @@


    /**

     * 处理京东分享订单

     * 
     * @param order

     * @param uid

     */

@@ -1073,6 +1104,7 @@


    /**

     * 处理拼多多自购返利订单

     * 
     * @param pddOrder

     * @param uid

     */

@@ -1135,9 +1167,9 @@
        }

    }



	
    /**

     * 处理拼多多分享订单

     * 
     * @param order

     * @param uid

     */