券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

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

@@ -32,6 +32,7 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

@@ -74,6 +75,9 @@
   

   @Resource

   private SystemCouponService systemCouponService;

	
   @Resource

   private HongBaoV2Service hongBaoV2Service;

   

   

   // 奖励订单图片

@@ -249,7 +253,7 @@
                  totalSettlement = commonOrder.getTotalPayment();

               }

               // 实付款

               commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);

               commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);



               listOrderGoods.add(commonGoodsVO);



@@ -630,6 +634,7 @@
            updateCommonOrder.setState(newCommonOrder.getState());

            updateCommonOrder.setStateWholeOrder(wholeOrderState);

            updateCommonOrder.setUpdateTime(new Date());

            updateCommonOrder.setTradeId(newCommonOrder.getTradeId());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

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

            continue;

@@ -793,6 +798,29 @@
            // 已失效

            order.setHongBaoState(3);

         }

			
         List<HongBaoV2> listhb = hongBaoV2Service.listChildrenById(order.getHongbaoId());

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

            if (listhb.size() == 1) {

               UserInfo userInfo = listhb.get(0).getUserInfo();

               if (userInfo != null) {

                  order.setLevelOneId(userInfo.getId()+"");

                  order.setLevelOneMoney(listhb.get(0).getMoney() + "");

               }

            } else if (listhb.size() == 2) {

               UserInfo userInfo = listhb.get(0).getUserInfo();

               if (userInfo != null) {

                  order.setLevelOneId(userInfo.getId()+"");

                  order.setLevelOneMoney(listhb.get(0).getMoney() + "");

               }

					
               UserInfo userInfo2 = listhb.get(1).getUserInfo();

               if (userInfo2 != null) {

                  order.setLevelTwoId(userInfo2.getId()+"");

                  order.setLevelTwoMoney(listhb.get(1).getMoney() + "");

               }

            }

         }



      }



@@ -887,7 +915,7 @@
               totalSettlement = commonOrder.getTotalPayment();

            }

            // 实付款

            commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);

            commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);



            listOrderGoods.add(commonGoodsVO);