src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java

@@ -4213,9 +4213,6 @@ 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;
         //查询是否计算出租车扣费

src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java

@@ -48,7 +48,6 @@ 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("该物料包已被添加，请重新选择");

src/main/resources/mapper/material/MaterialMapper.xml

@@ -146,7 +146,6 @@ 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