维权订单修改

admin

2019-08-29 c3b33f84b6ce927b4be681a4f1e4080706d390a9

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

@@ -467,6 +467,15 @@
         otherInfo.setSpreadHongBao(spreadHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(spreadMoney));

            else

               goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(spreadMoney));

         }



         goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

               hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));

         goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,

@@ -495,11 +504,11 @@
         shareValid = false;

         helpLink = configService.get("zigoulijian_nofanli_help");



         String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();

         BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);



         ReduceHongBao reduceHongBao = new ReduceHongBao();

         reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());

         reduceHongBao.setMoney(tljHongBao);

         reduceHongBao.setMoney(tljHongBao.toString());

         reduceHongBao.setName("付款立减 ");

         reduceHongBao.setTip("当日领取，当日内使用，过期失效");

         reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());

@@ -507,6 +516,16 @@
         OtherInfo otherInfo = new OtherInfo();

         otherInfo.setReduceHongBao(reduceHongBao);

         goodsDetail.setOtherInfo(otherInfo);



         // 1.6.5后改为福利价

         if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (goodsDetail.getCouponPrice() != null

                  && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)

               goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));

            else

               goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));

         }



      }

      extraVO.setFanliValid(fanliValid);

      extraVO.setShareValid(shareValid);

@@ -943,9 +962,7 @@
         try {

            goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

         } catch (TaoKeApiException e1) {

            e1.printStackTrace();

         } catch (TaobaoGoodsDownException e1) {

            e1.printStackTrace();

         }



         if (goodsList != null && goodsList.size() > 0) {