bug 修复

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java

@@ -88,7 +88,8 @@ public class OrderServiceImpl implements OrderService {
             List<OrderDetailDto> orderDetailDtos = orderInfoDto.getDetailsList();
             orderDetailDtos.removeIf(Objects::isNull);
             if (orderDetailDtos.isEmpty()) {
-                throw new RuntimeException("请正确添加设备");
+                continue;
+//                throw new RuntimeException("请正确添加设备");
             }
             //生成订单信息
             String code = "D" + System.currentTimeMillis();

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml

@@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderStatus == 2">
             ,receiving_user = #{userName}
             ,receiving_time = now()
-            ,order_remark = #{remark}
+
         </if>
         <if test="orderStatus == 3">
             ,pre_outbound_user = #{userName}
             ,pre_outbound_time = now()
-            ,order_remark = #{remark}
+
         </if>
         <if test="orderStatus == 4">
             ,take_over_user = #{userName}
@@ -59,20 +59,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderStatus == 5">
             ,rent_over_user = #{userName}
             ,rent_over_time = now()
-            ,order_remark = #{remark}
+
         </if>
         -- ah-simple 临时改动 START
         <if test="orderStatus == 20">
             ,rent_over_user = #{userName}
             ,rent_over_time = now()
-            ,order_remark = #{remark}
+
         </if>
         -- ah-simple 临时改动 END
         <if test="orderStatus == 99">
             ,refuse_user = #{userName}
             ,refuse_time = now()
-            ,order_remark = #{remark}
+
         </if>
+
         where order_id = #{orderId}
         <if test="maIds != null and maIds.size() > 0">
             and ma_id in