Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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

@@ -31,11 +31,13 @@
import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -91,6 +93,9 @@


   // @Resource

   // private LostOrderService lostOrderService;

	
   @Resource	
   private UserShareGoodsGroupService userShareGoodsGroupService;



   @Override

   @Transactional

@@ -289,6 +294,18 @@
                  }



                  hongBaoMapper.insertSelective(hongBao);

						
                  //统计分享订单的数据

                  try {

                     userShareGoodsGroupService.updateOrderRecord(hongBao);

                  } catch (UserShareGoodsRecordException e1) {

                     try {

                        LogHelper.errorDetailInfo(e1);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  }

						


                  try {

                     // 第三方提成订单被统计的通知