test1

Administrator

2018-12-10 20d26681f7466f2ff03131aabd98dcf1f146cd9a

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

@@ -45,6 +45,7 @@
import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

@@ -135,6 +136,9 @@


   @Resource

   private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;

	
   @Resource

   private HongBaoManageService hongBaoManageService;



   @Override

   public void processOrder(Map<String, List<TaoBaoOrder>> orders) {

@@ -417,7 +421,7 @@
         orderMapper.updateByPrimaryKeySelective(updateOrder);

         Order order = oldOrder;

         // 订单返利比例

         BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());

         BigDecimal  rate = hongBaoManageService.getFanLiRate();



         // 查找是否存在红包

         List<HongBao> hongBaoList = hongBaoMapper.selectByOid(order.getId());