生成待补单,退款待补单

src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java

@@ -117,9 +117,9 @@ public class ArtificerController {
     @ApiOperation("查询技师列表")
     public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
                                       String longitude,String latitude,Integer sort,Integer authentication,
-                                      Integer by,String city,Long classifyId,String phone,Integer isStart){
+                                      Integer by,String city,Long classifyId,String phone,Integer isStart,Integer technicianType){
         return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude,
-                sort,authentication,by,null,city,classifyId,phone,null,isStart);
+                sort,authentication,by,null,city,classifyId,phone,null,isStart,technicianType);
     }
 
     @GetMapping("/selectArtificer")
@@ -228,6 +228,12 @@ public class ArtificerController {
         return ordersService.cancelOrders(null,ordersId);
     }
 
+    @PostMapping("/cancelSupplementOrders")
+    @ApiOperation("待补单处理及待补单全单退款")
+    public Result cancelSupplementOrders(Long ordersId,Integer isAuto,Integer type){
+        return ordersService.cancelSupplementOrders(null,ordersId,isAuto,type);
+    }
+
     @PostMapping("/updateOrders")
     @ApiOperation("修改订单")
     public Result updateOrders(@RequestBody Orders orders){

src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java

@@ -131,9 +131,9 @@ public class AppArtificerController {
     @ApiOperation("查询技师列表")
     public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
                                       String longitude,String latitude,Integer sort,Integer authentication,
-                                      Integer by,String city,Long classifyId,String phone, Integer isStart){
+                                      Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType){
         return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude,
-                sort,authentication,by,-1,city,classifyId,phone,1,isStart);
+                sort,authentication,by,-1,city,classifyId,phone,1,isStart,technicianType);
     }
 
 
@@ -197,6 +197,13 @@ public class AppArtificerController {
         return ordersService.cancelOrders(userId,ordersId);
     }
 
+    @Login
+    @PostMapping("/cancelSupplementOrders")
+    @ApiOperation("变成待补单或全额退待补单")
+    public Result cancelSupplementOrders(@RequestAttribute Long userId,Long ordersId,Integer isAuto,Integer type){
+        return ordersService.cancelSupplementOrders(userId,ordersId,isAuto,type);
+    }
+
     @Login
     @GetMapping("/selectOrdersDetails")
     @ApiOperation("查询订单详情")

src/main/java/com/sqx/modules/artificer/service/ArtificerService.java

@@ -14,7 +14,7 @@ public interface ArtificerService extends IService<Artificer> {
 
     Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
                                String longitude,String latitude,Integer sort,Integer authentication,
-                               Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart);
+                               Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart,Integer technicianType);
 
     Artificer selectArtificerById(Long userId,Long artificerId,String longitude,String latitude);
 

src/main/java/com/sqx/modules/artificer/service/OrdersService.java

@@ -20,6 +20,8 @@ public interface OrdersService extends IService<Orders> {
 
     Result cancelOrders(Long userId,Long ordersId);
 
+    Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type);
+
     Result removeOrders(Long ordersId);
 
     Result refundOrdersMoney(Long ordersId,BigDecimal refundMoney);

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

@@ -69,10 +69,10 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
     @Override
     public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId,String artificerName,
                                       String longitude,String latitude,Integer sort,Integer authentication,
-                                      Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart){
+                                      Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart,Integer technicianType){
         Page<Artificer> pages=new Page<>(page,limit);
         IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName,
-                longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart);
+                longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType);
         List<Artificer> records = artificerIPage.getRecords();
         String value = commonInfoService.findOne(392).getValue();
         if("30".equals(value)){
@@ -427,7 +427,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
     public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){
         Map<String, Object> map = new HashMap<String, Object>();
         Page<Artificer> pages=new Page<>(page,limit);
-        IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart);
+        IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart,null);
         map.put("nearData",new PageUtils(artificerIPage));
         map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city)));
         return Result.success(map);