he2802 3 anos atrás
pai
commit
3d26430497

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

@@ -369,14 +369,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public Map<String, Object> placePlatInputOrder(OrderAddBo bo) {
         List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
         if (goodsList == null || goodsList.size() < 1) {
-            throw new CustomException("商品列表为空");
+            throw new CustomException("商品列表为空",510);
         }
         if (Validator.isEmpty(bo.getInputOrderSn())) {
-            throw new CustomException("录单单号为空");
+            throw new CustomException("录单单号为空",510);
         }
         OrderInput orderInput = iOrderInputService.queryBySn(bo.getInputOrderSn());
         if (Validator.isEmpty(orderInput)) {
-            throw new CustomException("录单单号不存在");
+            throw new CustomException("录单单号不存在",510);
         }
         Order add = BeanUtil.toBean(bo, Order.class);
         validEntityBeforeSave(add);
@@ -454,7 +454,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     redisCache.unlockLua(redisLockEntity);
                 }
                 if(!isArrange){
-                    throw new CustomException("分班错误");
+                    throw new CustomException("分班错误",510);
                 }
                 iOrderGoodsService.updateById(orderGoods);
             }
@@ -832,7 +832,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             Long makeGoodsId = goods.getMakeGoodsId();
             UserExamGoods entity = userExamGoodsService.getOne(new LambdaQueryWrapper<UserExamGoods>().eq(UserExamGoods::getUserId,userId).eq(UserExamGoods::getGoodsId,makeGoodsId).last("limit 1"));
             if(Validator.isEmpty(entity)){
-                throw new CustomException("请先购买此补考前培商品的绑定商品");
+                throw new CustomException("请先购买此补考前培商品的绑定商品",510);
             }
 
         }

+ 2 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderInputMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         any_value ( cet.education_name ) education_name,
         any_value ( cpt.project_name ) project_name,
         any_value ( cb.business_name ) business_name,
-        (select sum(og.goods_received) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = u.input_order_sn and og.refund_status = 2) goods_refund,
+        (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = u.input_order_sn and og.refund_status = 2) goods_refund,
         sum( og.goods_received ) goods_received,
         sum(u.order_price ) order_price,
         sum(u.pay_price) pay_price,
@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             any_value ( cet.education_name ) education_name,
             any_value ( cpt.project_name ) project_name,
             any_value ( cb.business_name ) business_name,
+            (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = oi.input_order_sn and og.refund_status = 2) goods_refund,
             sum( og.goods_received ) goods_received,
             sum( o.order_price ) order_price,
             sum( o.pay_price ) pay_price,