diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index b26d1da..6a28aa6 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -34,5 +34,10 @@ public class VipDetails implements Serializable { @TableField private String vipName; + //邀请赏金 private BigDecimal award; + //类型(0会员 1技师) + private Integer vipType; + //优惠力度 + private BigDecimal rate; } diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialMassageServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialMassageServiceImpl.java index c48e350..6576b35 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialMassageServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialMassageServiceImpl.java @@ -26,7 +26,7 @@ public class MaterialMassageServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper(); queryWrapper.eq("material_id", materialMassage.getMaterialId()); - queryWrapper.eq("massageTypeId", materialMassage.getMassageTypeId()); + queryWrapper.eq("massage_type_id", materialMassage.getMassageTypeId()); List materialMassageList = baseMapper.selectList(queryWrapper); if(materialMassageList.size()>0){ return Result.error("该物料包已被添加,请重新选择"); diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java index 121a6d9..247d1b0 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java @@ -76,15 +76,15 @@ public class MaterialServiceImpl extends ServiceImpl i public Result insertIgnoreNull(Material material) { material.setCreateTime(new Date()); material.setUpdateTime(new Date()); - // 创建服务查询封装器 - QueryWrapper materialQueryWrapper = new QueryWrapper(); - // 设置查询条件,根据物料ID查询物料按摩信息 - materialQueryWrapper.eq("goods_id", material.getGoodsId()); - // 根据查询封装器查询物料按摩信息 - Material materials = baseMapper.selectOne(materialQueryWrapper); - if(materials!=null && !materials.getId().equals(material.getId()) ){ - return Result.error("当前商品已绑定物料包,请重新选择!"); - } +// // 创建服务查询封装器 +// QueryWrapper materialQueryWrapper = new QueryWrapper(); +// // 设置查询条件,根据物料ID查询物料按摩信息 +// materialQueryWrapper.eq("goods_id", material.getGoodsId()); +// // 根据查询封装器查询物料按摩信息 +// Material materials = baseMapper.selectOne(materialQueryWrapper); +// if(materials!=null && !materials.getId().equals(material.getId()) ){ +// return Result.error("当前商品已绑定物料包,请重新选择!"); +// } return Result.success().put("data",materialMapper.insertIgnoreNull(material)); } diff --git a/src/main/resources/mapper/material/MaterialMapper.xml b/src/main/resources/mapper/material/MaterialMapper.xml index 646ccc9..e433114 100644 --- a/src/main/resources/mapper/material/MaterialMapper.xml +++ b/src/main/resources/mapper/material/MaterialMapper.xml @@ -155,7 +155,7 @@ INSERT INTO material and s.goods_id = #{material.goodsId} - and m.material_name like '%'#{material.materialName}'%' + and m.material_name like concat('%',#{material.materialName},'%') and m.status = #{material.status}