Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -113,6 +113,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "添加订单失败");
         }
         OrderDetails orderDetails = null;
+        List<OrderDetails> list =new ArrayList();
         for (Long o : addOrderVO.getProductId()) {
             LantoneProduct lantoneProduct = lantoneProductFacade.selectLanProduct(o);
             if (null == lantoneProduct) {
@@ -124,7 +125,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             orderDetails.setGmtCreate(DateUtil.now());
             orderDetails.setCreator(UserUtils.getCurrentPrincipleID());
             orderDetails.setProductId(o);
-            orderDetailsFacade.save(orderDetails);
+            list.add(orderDetails);
+        }
+        if(orderDetailsFacade.saveOrderDetails(list)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "添加订单失败");
         }
         return true;
     }

diagbotman-service/src/main/java/com/diagbot/mapper/OrderDetailsMapper.java

@@ -5,6 +5,7 @@ import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -30,4 +31,11 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @return
      */
     public OrderDetailStatus selectAllOrderDetialsByOrderNum(String orderNum);
+
+    /**
+     * 添加订单明细
+     * @param list
+     * @return 添加的条数
+     */
+    public int saveOrderDetails(@Param("list") List<OrderDetails> list);
 }

diagbotman-service/src/main/java/com/diagbot/service/OrderDetailsService.java

@@ -31,4 +31,11 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      * @return
      */
     public OrderDetailStatus selectAllOrderDetialsByOrderNum(String orderNum );
+
+    /**
+     * 添加订单明细
+     * @param list
+     * @return Boolean
+     */
+    public Boolean saveOrderDetails(List<OrderDetails> list);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OrderDetailsServiceImpl.java

@@ -41,6 +41,15 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         return baseMapper.selectAllOrderDetialsByOrderNum(orderNum);
     }
 
+    /**
+     * 添加订单明细
+     * @param list
+     * @return Boolean
+     */
+    @Override
+    public Boolean saveOrderDetails(List<OrderDetails> list) {
+        return baseMapper.saveOrderDetails(list) ==0 ? true:false;
+    }
 
 
 }

diagbotman-service/src/main/resources/mapper/OrderDetailsMapper.xml

@@ -64,4 +64,13 @@
         (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and audit_status is null and is_deleted = 'N') not_audit
         from dual
     </select>
+
+    <insert id="saveOrderDetails" parameterType="java.util.List">
+        <if test="list.size !=0 ">
+            INSERT INTO `diag_order_details` (`gmt_create`, `creator`, `order_num`, `product_id`, `user_id`) VALUES
+            <foreach collection="list" item="demo" index="index" separator=",">
+                 (#{demo.gmtCreate}, #{demo.creator}, #{demo.orderNum}, #{demo.productId}, #{demo.userId})
+            </foreach>
+        </if>
+    </insert>
 </mapper>