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 de7308c..41027cc 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 @@ -7124,7 +7124,7 @@ public class OrdersServiceImpl extends ServiceImpl implements userService.sendWxMessage(apkey, data, user.getWxOpenId()); } //执行对应项目减去技师物料包 - materialArtificerService.accomplishOrders(orders.getMassageTypeId(),orders.getArtificerId()); + materialArtificerService.accomplishOrders(orders.getMassageTypeId(),orders.getArtificerId(),orders.getOrdersNo()); if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){ Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId()); diff --git a/src/main/java/com/sqx/modules/material/controller/app/AppMaterialController.java b/src/main/java/com/sqx/modules/material/controller/app/AppMaterialController.java index 35d867b..3155b23 100644 --- a/src/main/java/com/sqx/modules/material/controller/app/AppMaterialController.java +++ b/src/main/java/com/sqx/modules/material/controller/app/AppMaterialController.java @@ -1,7 +1,11 @@ package com.sqx.modules.material.controller.app; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; +import com.sqx.modules.helpCenter.entity.HelpClassify; import com.sqx.modules.material.entity.MaterialArtificer; +import com.sqx.modules.material.entity.MaterialRecord; import com.sqx.modules.material.service.MaterialArtificerService; import com.sqx.modules.material.service.MaterialMassageService; import com.sqx.modules.material.service.MaterialService; @@ -27,4 +31,10 @@ public class AppMaterialController { public Result selectMaterialArtificer(Integer page, Integer limit, MaterialArtificer materialArtificer) { return materialService.selectMaterialArtificer(page,limit, materialArtificer); } + @GetMapping("/selectMaterialRecord") + @ApiOperation("app查询技师物料记录") + public Result selectMaterialRecord(Integer page, Integer limit, MaterialRecord materialRecord) { + IPage page1 = materialService.selectMaterialRecord(page,limit, materialRecord); + return Result.success().put("data",new PageUtils(page1)); + } } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/material/dao/MaterialMapper.java b/src/main/java/com/sqx/modules/material/dao/MaterialMapper.java index 6a7f533..be973c4 100644 --- a/src/main/java/com/sqx/modules/material/dao/MaterialMapper.java +++ b/src/main/java/com/sqx/modules/material/dao/MaterialMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.sqx.common.utils.Result; import com.sqx.modules.material.entity.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,4 +75,6 @@ public interface MaterialMapper extends BaseMapper { IPage selectMaterialMassage(IPage page1, @Param("materialMassage") MaterialMassage materialMassage); IPage selectPages(IPage page1, @Param("material")Material material); + + IPage selectMaterialRecord(IPage page1, @Param("materialRecord") MaterialRecord materialRecord); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/material/entity/MaterialRecord.java b/src/main/java/com/sqx/modules/material/entity/MaterialRecord.java index b2c69c4..9ab81ae 100644 --- a/src/main/java/com/sqx/modules/material/entity/MaterialRecord.java +++ b/src/main/java/com/sqx/modules/material/entity/MaterialRecord.java @@ -37,6 +37,8 @@ public class MaterialRecord implements Serializable { private String endDate; @TableField(exist = false) private String materialName; + @TableField(exist = false) + private String materiaImg; /** * 技师id */ diff --git a/src/main/java/com/sqx/modules/material/service/MaterialArtificerService.java b/src/main/java/com/sqx/modules/material/service/MaterialArtificerService.java index 9b3c3f1..8250626 100644 --- a/src/main/java/com/sqx/modules/material/service/MaterialArtificerService.java +++ b/src/main/java/com/sqx/modules/material/service/MaterialArtificerService.java @@ -17,7 +17,7 @@ public interface MaterialArtificerService extends IService { Result materialArtificerUpdata(MaterialArtificer materialArtificer); - String accomplishOrders(Long MessageTypeId, Long artificerId); + String accomplishOrders(Long MessageTypeId, Long artificerId,String orderNo); void changePay(Long id, Long userId, Integer number); } diff --git a/src/main/java/com/sqx/modules/material/service/MaterialService.java b/src/main/java/com/sqx/modules/material/service/MaterialService.java index 0cc2d87..d5a583c 100644 --- a/src/main/java/com/sqx/modules/material/service/MaterialService.java +++ b/src/main/java/com/sqx/modules/material/service/MaterialService.java @@ -1,11 +1,13 @@ package com.sqx.modules.material.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.sqx.common.utils.Result; import com.sqx.modules.artificer.entity.Agency; import com.sqx.modules.material.entity.Material; import com.sqx.modules.material.entity.MaterialArtificer; import com.sqx.modules.material.entity.MaterialMassage; +import com.sqx.modules.material.entity.MaterialRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -75,4 +77,6 @@ public interface MaterialService extends IService { Result selectMaterialMassage(Integer page, Integer limit, MaterialMassage materialMassage); Result materialList(Material material); + + IPage selectMaterialRecord(Integer page, Integer limit, MaterialRecord materialRecord); } \ No newline at end of file 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 2eecb06..e25247c 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 @@ -94,14 +94,14 @@ public class MaterialArtificerServiceImpl extends ServiceImpl materialMassageQueryWrapper = new QueryWrapper(); QueryWrapper materialArtificerQueryWrapper = new QueryWrapper(); QueryWrapper massageTypeQueryWrapper = new QueryWrapper(); @@ -134,7 +134,7 @@ public class MaterialArtificerServiceImpl extends ServiceImpl i return Result.success().put("data", materialIPage); } + @Override + public IPage selectMaterialRecord(Integer page, Integer limit, MaterialRecord materialRecord) { + IPage page1 = new Page(page, limit); + return materialMapper.selectMaterialRecord(page1,materialRecord); + } + } diff --git a/src/main/resources/mapper/material/MaterialMapper.xml b/src/main/resources/mapper/material/MaterialMapper.xml index 73815da..28f0eb2 100644 --- a/src/main/resources/mapper/material/MaterialMapper.xml +++ b/src/main/resources/mapper/material/MaterialMapper.xml @@ -168,4 +168,23 @@ INSERT INTO material and m.status = #{material.status} + + +