Merge branch 'mater-1.6.0' into div

admin

2019-08-21 0f3fc66c7e2b234411e2f1b35671e7a547cdfd44

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

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.util.Date;



import javax.annotation.Resource;

@@ -30,4 +31,10 @@
      map.setOrder(order);

      orderHongBaoMapMapper.insertSelective(map);

   }

	
	
   @Override

   public BigDecimal getCouponHongbaoByOrderNo(String orderNo, Long uid) {

      return  orderHongBaoMapMapper.getCouponHongbaoByOrderNo(orderNo, uid);

   }

}