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

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.domain.CourseChapterSection;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.OrderBillGoods;
 import com.zhongzheng.modules.order.domain.OrderBillSheet;
@@ -36,6 +37,9 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
     @Autowired
     private IOrderBillGoodsService iOrderBillGoodsService;
 
+    @Autowired
+    private IOrderGoodsService iOrderGoodsService;
+
     @Override
     public OrderBillSheetVo queryById(Long sheetId){
         OrderBillSheet db = this.baseMapper.selectById(sheetId);
@@ -137,6 +141,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
             coll.add(orderGoods);
+            iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, bo.getOrderSn()));
         }
         iOrderBillGoodsService.saveBatch(coll);
         this.save(add);

+ 3 - 3
zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cb.business_name,
             s.school_name,
             m.category_name,
-            og.goodsReceived,
-            og.refundStatus,
-            og.payStatus
+            og.goods_received,
+            og.refund_status,
+            og.pay_status
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn