|
@@ -197,6 +197,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
add.setPayType(1); //微信支付
|
|
add.setPayType(1); //微信支付
|
|
|
add.setOrderStatus(0);
|
|
add.setOrderStatus(0);
|
|
|
BigDecimal totalPrice = new BigDecimal(0);
|
|
BigDecimal totalPrice = new BigDecimal(0);
|
|
|
|
|
+ Boolean couponBool = true;
|
|
|
for (OrderGoodsAddBo g : goodsList) {
|
|
for (OrderGoodsAddBo g : goodsList) {
|
|
|
g.setOrderSn(out_trade_no);
|
|
g.setOrderSn(out_trade_no);
|
|
|
if(g.getNum()<1){
|
|
if(g.getNum()<1){
|
|
@@ -234,7 +235,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
throw new CustomException("商品错误");
|
|
throw new CustomException("商品错误");
|
|
|
}
|
|
}
|
|
|
//查詢該券是否使用於此課程上
|
|
//查詢該券是否使用於此課程上
|
|
|
- if(couponId!=null&&couponId>0 && g.getGoodsType()==1 && iCouponService.selectCount(g.getGoodsId(),couponId) > 0 ){
|
|
|
|
|
|
|
+ if(couponBool && couponId!=null&&couponId>0 && g.getGoodsType()==1 && iCouponService.selectCount(g.getGoodsId(),couponId) > 0 ){
|
|
|
//使用优惠券
|
|
//使用优惠券
|
|
|
Coupon coupon= iCouponService.queryByIdAndUserId(couponId,add.getUserId());
|
|
Coupon coupon= iCouponService.queryByIdAndUserId(couponId,add.getUserId());
|
|
|
if(!Validator.isNotNull(coupon)){
|
|
if(!Validator.isNotNull(coupon)){
|
|
@@ -255,6 +256,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
OrderCouponAddBo orderCouponAddBo = new OrderCouponAddBo();
|
|
OrderCouponAddBo orderCouponAddBo = new OrderCouponAddBo();
|
|
|
orderCouponAddBo.setCouponId(couponId);
|
|
orderCouponAddBo.setCouponId(couponId);
|
|
|
orderCouponAddBo.setOrderSn(out_trade_no);
|
|
orderCouponAddBo.setOrderSn(out_trade_no);
|
|
|
|
|
+ couponBool=false;
|
|
|
if(!iOrderCouponService.insertByAddBo(orderCouponAddBo)){
|
|
if(!iOrderCouponService.insertByAddBo(orderCouponAddBo)){
|
|
|
throw new CustomException("优惠券数据错误");
|
|
throw new CustomException("优惠券数据错误");
|
|
|
}
|
|
}
|