搜索品牌匹配

yujian

2019-12-17 d8e6fe75c7bfb14c73da86b79991bda18d94a105

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

@@ -24,8 +24,6 @@
import com.aliyun.openservices.ons.api.transaction.TransactionProducer;

import com.aliyun.openservices.ons.api.transaction.TransactionStatus;

import com.google.gson.Gson;

import com.opensymphony.xwork2.util.Element;

import com.sun.org.apache.xml.internal.serializer.ElemDesc;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

@@ -63,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;

@@ -281,10 +280,11 @@
         for (TaoBaoOrder taoBaoOrder : orderList) {

            ElmeOrder elmeOrder = createElmeOrder(taoBaoOrder);

            try {

               elmeOrderService.addOrder(elmeOrder);

               elmeOrderProcessService.processOrder(elmeOrder);

            } catch (ElmeOrderException e) {

               e.printStackTrace();

            }

				
         }

      }

   }

@@ -583,9 +583,7 @@
      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      if (1 > 0)

         return;

      //



      try {

         orderMoneySettleService.inviteSettleJD(uid);

      } catch (OrderMoneySettleException e) {

@@ -1196,6 +1194,9 @@
   @Resource

   private ElmeOrderService elmeOrderService;



	
   @Resource

   private ElmeOrderProcessService elmeOrderProcessService;

   /**

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

    * 

@@ -1261,13 +1262,12 @@
   @Transactional

   private void addHongBaoWithMQ(List<CommonOrderAddResultDTO> commonOrderList, String orderId, Long uid,

         int sourceType, int hongBaoType) {



      final List<CommonOrder> coList = convertCommonOrder(commonOrderList);

      int resultCode = 0;

      try {

         long time = TimeUtil.convertToTimeTemp("2019-12-06", "yyyy-MM-dd");

         if (!Constant.IS_TEST)

            time = TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd");

            time = TimeUtil.convertToTimeTemp("2019-12-20", "yyyy-MM-dd");



         if (coList.get(0).getThirdCreateTime().getTime() < time)

            resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);