Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -3,7 +3,6 @@
import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

@@ -18,6 +17,7 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.order.CommonOrder;

@@ -174,7 +174,8 @@
               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

               if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_ERJI == hongBaoType) {

                     || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

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

                  titleMap.put("content", "为保障用户隐私，商品信息已隐藏!");

                  titleMap.put("fontColor", "#888888");

@@ -277,14 +278,14 @@
            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType) {

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

@@ -361,54 +362,75 @@


   @Transactional

   @Override

   public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException {

      CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),

            Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

      if (commonOrder == null)// 新增

      {

         commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

         CommonOrderGoods goods = new CommonOrderGoods();

         goods.setGoodsId(taoBaoOrder.getAuctionId() + "");

         goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

         // 商品是否已经插入

         List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper

               .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());

         if (commonGoodsList.size() <= 0)// 不存在就插入商品

   public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {

      List<CommonOrder> commonOrderList = new ArrayList<>();

      for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {

         CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),

               Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

         if (commonOrder == null)// 新增

         {

            TaoBaoGoodsBrief taoBaoGoods = null;

            try {

               taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

            } catch (TaobaoGoodsDownException e) {

               e.printStackTrace();

            commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

            CommonOrderGoods goods = new CommonOrderGoods();

            goods.setGoodsId(taoBaoOrder.getAuctionId() + "");

            goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

            // 商品是否已经插入

            List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper

                  .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());

            if (commonGoodsList.size() <= 0)// 不存在就插入商品

            {

               TaoBaoGoodsBrief taoBaoGoods = null;

               try {

                  taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  e.printStackTrace();

               }

               if (taoBaoGoods != null) {

                  goods = CommonOrderGoodsFactory.create(taoBaoGoods);

               }

               goods.setCreateTime(new Date());

               goods.setUpdateTime(new Date());

               commonOrderGoodsMapper.insertSelective(goods);

            } else

               goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());

            commonOrder.setCommonOrderGoods(goods);

            commonOrder.setUserInfo(new UserInfo(uid));

            commonOrder.setCreateTime(new Date());

            commonOrderMapper.insertSelective(commonOrder);



            commonOrderList.add(commonOrder);

            continue;

         } else {// 修改

            // 已经结算或者已经失效的订单不处理

            if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX) {

               commonOrderList.add(commonOrder);

               continue;

            }

            if (taoBaoGoods != null) {

               goods = CommonOrderGoodsFactory.create(taoBaoGoods);

            }

            goods.setCreateTime(new Date());

            goods.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(goods);

         } else

            goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());

         commonOrder.setCommonOrderGoods(goods);

         commonOrder.setUserInfo(new UserInfo(uid));

         commonOrder.setCreateTime(new Date());

         commonOrderMapper.insertSelective(commonOrder);

         return commonOrder;

      } else {// 修改

         // 已经结算或者已经失效的订单不处理

         if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX)

            return commonOrder;

         CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

         CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());

         updateCommonOrder.seteIncome(newCommonOrder.geteIncome());

         updateCommonOrder.setEstimate(newCommonOrder.getEstimate());

         updateCommonOrder.setPayment(newCommonOrder.getPayment());

         updateCommonOrder.setSettlement(newCommonOrder.getSettlement());

         updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());

         updateCommonOrder.setState(newCommonOrder.getState());

         updateCommonOrder.setUpdateTime(new Date());

         commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

         return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());

            CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

            CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());

            updateCommonOrder.seteIncome(newCommonOrder.geteIncome());

            updateCommonOrder.setEstimate(newCommonOrder.getEstimate());

            updateCommonOrder.setPayment(newCommonOrder.getPayment());

            updateCommonOrder.setSettlement(newCommonOrder.getSettlement());

            updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());

            updateCommonOrder.setState(newCommonOrder.getState());

            updateCommonOrder.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

            commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));

            continue;

         }

      }

      return commonOrderList;

   }



   @Override

   public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,

         String endTime, Integer day) {

      return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);

   }



   @Override

   public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {



      return commonOrderMapper.countByUidAndOrderStateWithOrderBalanceTime(uid, state, minDate, maxDate);

   }

}