Sfoglia il codice sorgente

Accept Merge Request #96: (dev-xwt -> dev-test)

Merge Request: pil

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/96?initial=true
夏文涛 1 anno fa
parent
commit
1950cf8b09

+ 2 - 2
src/main/java/com/sqx/modules/errand/controller/app/AppTbIndentController.java

@@ -375,7 +375,7 @@ public class AppTbIndentController {
     @Login
     @ApiOperation("批量转单")
     @PostMapping("/transferOfOrders")
-    public Result transferOfOrders(@RequestAttribute Long userId, @Valid RiderTransferOrdersDTO transferOrderDTO) {
+    public Result transferOfOrders(@RequestAttribute Long userId, @RequestBody RiderTransferOrdersDTO transferOrderDTO) {
         if (userId.equals(transferOrderDTO.getRiderId())) {
             throw new SqxException("不能转单给自己!");
         }
@@ -401,7 +401,7 @@ public class AppTbIndentController {
             data.setIsRider(1);
         }
 
-        boolean transferOrders = tbIndentService.saveBatch(datas);
+        boolean transferOrders = tbIndentService.updateBatchById(datas);
         if(transferOrders){
             String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
             List<TransferRecordEntity> trs = new ArrayList<>();

+ 0 - 1
src/main/java/com/sqx/modules/errand/dto/RiderTransferOrdersDTO.java

@@ -13,7 +13,6 @@ import java.util.List;
 public class RiderTransferOrdersDTO {
 
     @ApiModelProperty(value = "配送单集合id", required = true)
-    @NotEmpty(message = "配送单集合id不能为空")
     private List<Long> indentIds;
 
     @ApiModelProperty("待分配骑手ID")