he2802 4 лет назад
Родитель
Сommit
3788346400

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -235,7 +235,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
 
             //查詢該券是否使用於此課程上
-            if(couponId>0 && g.getGoodsType()==1 && iCouponService.selectCount(g.getGoodsId(),couponId) > 0 ){
+            if(couponId!=null&&couponId>0 && g.getGoodsType()==1 && iCouponService.selectCount(g.getGoodsId(),couponId) > 0 ){
                 //使用优惠券
                 Coupon coupon= iCouponService.queryByIdAndUserId(couponId,add.getUserId());
                 if(!Validator.isNotNull(coupon)){
@@ -262,7 +262,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
 
             //查詢該活動是否使用於此課程上
-            if(activity >0 && g.getGoodsType()==1 && activityConfigurationService.selectCount(g.getGoodsId(),activity) > 0 ){
+            if(activity!=null&&activity >0 && g.getGoodsType()==1 && activityConfigurationService.selectCount(g.getGoodsId(),activity) > 0 ){
                 //使用活動
                 ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(activity);
                 if(!Validator.isNotNull(activityConfigurationVo)){

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/OrderPossessUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.course.domain.MajorCategory;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.exam.domain.ExamNote;
 import com.zhongzheng.modules.exam.vo.ExamNoteVo;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;