fix: 修改
parent
e1543fa85e
commit
24467a92a6
|
@ -71,6 +71,13 @@ public class RechargeOrderController {
|
|||
return success(true);
|
||||
}
|
||||
|
||||
@PutMapping("/updateByIds")
|
||||
@Operation(summary = "批量更新订单状态")
|
||||
public CommonResult<Boolean> updateByIds(@Valid @RequestBody BatchOrderUpdateReqVO updateReqVO) {
|
||||
rechargeOrderService.updateByIds(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除订单")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
package cn.iocoder.yudao.module.shop.controller.admin.recharge.vo;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Title:BatchOrderUpdateReqVO
|
||||
* @Description: TODO
|
||||
* @author: tangqian
|
||||
* @date: 2023/6/9 17:45
|
||||
* @version: V1.0.0
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
public class BatchOrderUpdateReqVO implements Serializable {
|
||||
private List<Long> ids;
|
||||
private Boolean status;
|
||||
}
|
|
@ -75,7 +75,7 @@ public class RechargeOrderBaseVO {
|
|||
@NotNull(message = "支付方式不能为空")
|
||||
private String payType;
|
||||
|
||||
@Schema(description = "订单状态(0:待发货;1:待收货;2:已收货,待评价;3:已完成;)", required = true, example = "2")
|
||||
@Schema(description = "订单状态(0:待发货;1:已发货)", required = true, example = "2")
|
||||
@NotNull(message = "订单状态(0:待发货;1:待收货;2:已收货,待评价;3:已完成;)不能为空")
|
||||
private Boolean status;
|
||||
|
||||
|
|
|
@ -91,4 +91,6 @@ public interface RechargeOrderService {
|
|||
ShoppingMemberOrderVO shoppingOrderCount(Integer type, Long loginUserId);
|
||||
|
||||
List<PromoterDrawExcelVO> findPromoterDrawExcel(PromoterDrawReqExcelVO excelVO);
|
||||
|
||||
Boolean updateByIds(BatchOrderUpdateReqVO updateReqVO);
|
||||
}
|
||||
|
|
|
@ -138,6 +138,17 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
|
|||
return rechargeOrderMapper.findPromoterDrawExcel(excelVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateByIds(BatchOrderUpdateReqVO updateReqVO) {
|
||||
List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery().in(RechargeOrderDO::getId, updateReqVO.getIds()));
|
||||
if (!CollectionUtils.isEmpty(orderDOS)) {
|
||||
orderDOS.forEach(e -> {
|
||||
e.setStatus(updateReqVO.getStatus());
|
||||
});
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<PromoterDrawVO> findPromoterDrawPage(PromoterDrawReqVO pageReqVO) {
|
||||
Page<PromoterDrawVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
|
||||
|
|
|
@ -116,6 +116,7 @@
|
|||
a.pay_price,
|
||||
a.paid,
|
||||
a.refund_status,
|
||||
a.status,
|
||||
CONVERT(a.pay_price*e.member_commission/100, DECIMAL(15,2)) as commissionPrice,
|
||||
a.paid,
|
||||
d.parent_organization_name
|
||||
|
|
|
@ -21,7 +21,7 @@ import java.io.Serializable;
|
|||
public class AppPromoterCreateReqVO implements Serializable {
|
||||
@Schema(description = "推广员名称", required = true, example = "5841")
|
||||
@NotEmpty(message = "推广员名称不能为空")
|
||||
@Size(max = 10,message = "推广员名称最长不能超过{max}")
|
||||
// @Size(max = 10,message = "推广员名称最长不能超过{max}")
|
||||
private String nickname;
|
||||
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ public class PromoterBaseVO {
|
|||
|
||||
@Schema(description = "推广员名称", required = true, example = "5841")
|
||||
@NotEmpty(message = "推广员名称不能为空")
|
||||
@Size(max = 10,message = "推广员名称最长不能超过{max}")
|
||||
// @Size(max = 10,message = "推广员名称最长不能超过{max}")
|
||||
private String nickname;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue