Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -2,6 +2,7 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

@@ -758,6 +759,7 @@
            updateHongBao.setId(hongBao.getId());

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

            // 添加到红包返利记录集合

            hbIdList.add(hongBao.getId());

@@ -799,6 +801,7 @@
            updateHongBao.setId(hb.getId());

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

            // 添加到红包返利记录集合

            hbIdList.add(hb.getId());

@@ -819,8 +822,23 @@


         // 添加新版详情记录

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, 0, 0, 0, invitemoney,

                  new Date());

            // 查询邀请赚的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();

            Date maxDate = new Date(TimeUtil

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

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

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

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

                  minDate, maxDate);

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

                  minDate, maxDate);

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

                  minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

            userMoneyDetail.setId(accountDetails.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e) {

@@ -869,6 +887,7 @@
            updateHongBao.setId(hongBao.getId());

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBao.STATE_YILINGQU);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

            // 添加到红包返利记录集合

            hbIdList.add(hongBao.getId());

@@ -897,8 +916,24 @@


         // 添加新版详情记录

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, 0, 0, 0, sharemoney,

                  new Date());

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

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

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

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

            long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_JS, minDate, maxDate);

            long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_WQ, minDate, maxDate);

            long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_SX, minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,

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

            userMoneyDetail.setId(accountDetails.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e) {

@@ -998,13 +1033,14 @@
         orderMapper.updateByPrimaryKeySelective(updateOrder);



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

         List<CommonOrder> commonOrderList = null;

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_ZIGOU);

            commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

            try {

               LogHelper.errorDetailInfo(e, null, "订单号:" + orderId);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }

@@ -1028,15 +1064,13 @@
            return;



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_SHARE_GOODS);

            List<CommonOrder> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrders, HongBaoV2.TYPE_SHARE_GOODS);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

               e1.printStackTrace();

            }

         }

      }