From 1a89bcb3babcab3327a8d9f2c877f0a505496fd2 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 2 Jul 2024 11:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BA=E7=A9=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/artificer/service/impl/OrdersServiceImpl.java  | 3 +++
 .../material/service/impl/MaterialArtificerServiceImpl.java    | 1 +
 src/main/resources/mapper/material/MaterialMapper.xml          | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index ed4a2c2..3a17d85 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -4181,6 +4181,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         BigDecimal storageRate = BigDecimal.ONE.subtract(rate);
         //钱包支付技师提成
         BigDecimal taxiMoney = orders.getTaxiMoney();
+        if(taxiMoney==null){
+            taxiMoney = BigDecimal.ZERO;
+        }
         BigDecimal artificerPrice = BigDecimal.ZERO;
         BigDecimal valueStorageDeduction = BigDecimal.ZERO;
         //查询是否计算出租车扣费
diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
index cbdaa4b..3a0c619 100644
--- a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
+++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
@@ -48,6 +48,7 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
         materialArtificer.setUpdateTime(new Date());
         QueryWrapper<MaterialArtificer> queryWrapper = new QueryWrapper();
         queryWrapper.eq("material_id", materialArtificer.getMaterialId());
+        queryWrapper.eq("artificer_id", materialArtificer.getArtificerId());
         List<MaterialArtificer> materialArtificerList = baseMapper.selectList(queryWrapper);
         if(materialArtificerList.size()>0){
             return Result.error("该物料包已被添加，请重新选择");
diff --git a/src/main/resources/mapper/material/MaterialMapper.xml b/src/main/resources/mapper/material/MaterialMapper.xml
index e433114..8e28ac5 100644
--- a/src/main/resources/mapper/material/MaterialMapper.xml
+++ b/src/main/resources/mapper/material/MaterialMapper.xml
@@ -146,6 +146,7 @@ INSERT INTO material
         <if test="materialMassage.status!=null and materialMassage.status !=''">
             and m.status = #{materialMassage.status}
         </if>
+        GROUP BY m.id,m.material_name
     </select>
     <select id="selectPages" resultType="com.sqx.modules.material.entity.Material">
         select m.status,m.id ,m.material_name,m.material_minimum,m.goods_id,s.title as goodsName,m.detail FROM material m