拼多多兼容免单

yujian

2020-06-29 12af83285ddf90cca4f5ef637a15adc1a7e0efa2

拼多多兼容免单

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -480,15 +480,15 @@
            goodsDetail.setShopInfo(ShopInfoVOFactory.convertTaoBaoShop(shop));

        }



        // 有券处理

        if (goodsDetail.isHasCoupon()) {

            if (!StringUtil.isNullOrEmpty(from)) {

                if ("miandan".equals(from)) { // 免单商品

                    MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();

                    moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());

                    goodsDetail.setMoneyInfo(moneyInfo);

                }

        // 免单商品

        if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {

            MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();

            if (goodsDetail.isHasCoupon()) {

                moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());

            } else {

                moneyInfo.setFanliMoney("¥" + goodsDetail.getZkPrice());

            }

            goodsDetail.setMoneyInfo(moneyInfo);

        }



        extraVO.setTbPidInfo(clientTBPid);

@@ -1074,6 +1074,17 @@
        if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

            getCloudInfo(acceptData, uid, goodsDetail, extraVO); // 云发单文案信息

        }

		
        // 免单商品

        if (!StringUtil.isNullOrEmpty(from) && "miandan".equals(from)) {

            MoneyInfoVO moneyInfo = goodsDetail.getMoneyInfo();

            if (goodsDetail.isHasCoupon()) {

                moneyInfo.setFanliMoney("¥" + goodsDetail.getCouponPrice());

            } else {

                moneyInfo.setFanliMoney("¥" + goodsDetail.getZkPrice());

            }

            goodsDetail.setMoneyInfo(moneyInfo);

        }



        JSONObject object = new JSONObject();

        object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -664,7 +664,7 @@
        // 遍历是否存在符合相应商品

        for (CommonOrder commonOrder: list) {

            // 订单失效

            if(commonOrder.getState() != CommonOrder.STATE_FK || commonOrder.getState() != CommonOrder.STATE_JS)

            if(commonOrder.getState() != CommonOrder.STATE_FK && commonOrder.getState() != CommonOrder.STATE_JS)

                continue;

            // 付款金额限制

            BigDecimal payment = commonOrder.getPayment();