Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

@@ -52,6 +53,8 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;

import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;

@@ -64,6 +67,7 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.order.WeiQuanInfo;



import net.sf.json.JSONObject;



@@ -326,6 +330,14 @@


      // 是否存在奖励券

      boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

		
      // 2019.8.1开始返回维权信息

      Date august = null;

      try {

         august = TimeUtil.parse("2019-08-01");

      } catch (ParseException e) {

         e.printStackTrace();

      }



      /* 组织订单状态 等信息 */

      for (CommonOrderVO order : listOrder) {

@@ -374,6 +386,11 @@
            }

         }



         BigDecimal hongBao = order.getHongBao();

         if (hongBao == null) {

            hongBao = new BigDecimal(0);

         }

			
         if (CommonOrder.STATE_FK == orderState) {

            orderStateContent = "已付款";

         } else if (CommonOrder.STATE_JS == orderState) {

@@ -390,7 +407,7 @@
                     .selectListByOrderIdAndState(order.getOrderNo(), "维权成功");



               boolean isPart = false;// 默认失效



               BigDecimal weiQuanMoney = new BigDecimal(0);

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

                  BigDecimal fanTotalMoney = new BigDecimal(0);

                  for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {

@@ -398,17 +415,38 @@
                     if (fanMoney != null) {

                        fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);

                     }

                     weiQuanMoney = MoneyBigDecimalUtil.add(weiQuanOrder.getMoney(), weiQuanMoney);

                  }



                  if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {

                  if (fanTotalMoney.compareTo(hongBao) < 0) {

                     isPart = true;

                  }

               }



               if (isPart) {

                  hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效

					
               if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

                  if (isPart) {

                     hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 部分失效

                  } else {

                     hongBaoState = HongBaoV2.STATE_SHIXIAO; // 全部失效

                  }

               } else {

                  hongBaoState = HongBaoV2.STATE_SHIXIAO; // 全部失效

                  // 2019.8.1 返回维权信息

                  if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {

                     orderStateContent = "维权成功";

                     WeiQuanInfo weiQuanInfo = new WeiQuanInfo();

                     weiQuanInfo.setOldHongBao("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                     if (isPart) {

                        // 维权失效金额=维权的金额*获得的红包/结算金额

                        BigDecimal settlement = order.getSettlement();

                        BigDecimal wqHongbao = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);

                        weiQuanInfo.setWqHongBao("维权：-¥" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);

                     } else {

                        hongBao = new BigDecimal(0);

                        weiQuanInfo.setWqHongBao("维权：-¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                     }

                     order.setWeiQuanInfo(weiQuanInfo);

                  }

               }

            }

         }

@@ -495,10 +533,7 @@


         hongbaoInfo = hongBaoState_Str + hongbaoInfo;



         BigDecimal hongBao = order.getHongBao();

         if (hongBao == null) {

            hongBao = new BigDecimal(0);

         }

			
         Map<String, String> hongBaoMap = new HashMap<String, String>();

         hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

         hongBaoMap.put("fontColor", hongbaoInfoFontColor);