Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-19 bb07147aaa96d1ef4c99e358dbbe7dad160dc62a

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

@@ -61,6 +61,7 @@
import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderProcessService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderService;

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

import com.yeshi.fanli.service.inter.money.UserMoneyService;

@@ -262,6 +263,13 @@
         elmeOrder.setIsSettle(true);

      else

         elmeOrder.setIsSettle(false);



      if (!taoBaoOrder.getOrderState().equalsIgnoreCase("订单失效"))

         elmeOrder.setState(1);

      else {

         elmeOrder.setState(0);

         elmeOrder.setPayMoney(new BigDecimal(0));

      }

      elmeOrder.setTrackPid(

            String.format("mm_124933865_%s_%s", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));

      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {

@@ -279,10 +287,11 @@
         for (TaoBaoOrder taoBaoOrder : orderList) {

            ElmeOrder elmeOrder = createElmeOrder(taoBaoOrder);

            try {

               elmeOrderService.addOrder(elmeOrder);

               elmeOrderProcessService.processOrder(elmeOrder);

            } catch (ElmeOrderException e) {

               e.printStackTrace();

            }



         }

      }

   }

@@ -408,7 +417,7 @@
   private HongBaoOrderMapper hongBaoOrderMapper;



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());

@@ -1192,6 +1201,9 @@
   @Resource

   private ElmeOrderService elmeOrderService;



   @Resource

   private ElmeOrderProcessService elmeOrderProcessService;



   /**

    * 获取饿了么可以返利的红包

    *