|
|
@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.lang.Validator;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.zhongzheng.common.exception.CustomException;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
|
|
|
@@ -264,9 +265,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
lqw.eq(bo.getUserId() != null, Order::getUserId, bo.getUserId());
|
|
|
lqw.eq(Order::getOrderStatus, 1);
|
|
|
List<Order> list = this.list(lqw);
|
|
|
- BigDecimal price = new BigDecimal("0");
|
|
|
- for (Order order : list) {
|
|
|
- price = price.add(order.getOrderPrice());
|
|
|
+ if(!CollectionUtils.isEmpty(list)) {
|
|
|
+ BigDecimal price = new BigDecimal("0");
|
|
|
+ for (Order order : list) {
|
|
|
+ price = price.add(order.getOrderPrice());
|
|
|
+ }
|
|
|
}
|
|
|
List<CouponVo> couponVos=iCouponService.listUserOrder(bo.getUserId(),0);
|
|
|
List<CouponVo> couponDiscounts=iCouponService.listUserOrder(bo.getUserId(),1);
|