diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java index e726f5ee2..0d24409c5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java @@ -71,6 +71,13 @@ public class RechargeOrderController { return success(true); } + @PutMapping("/updateByIds") + @Operation(summary = "批量更新订单状态") + public CommonResult updateByIds(@Valid @RequestBody BatchOrderUpdateReqVO updateReqVO) { + rechargeOrderService.updateByIds(updateReqVO); + return success(true); + } + @DeleteMapping("/delete") @Operation(summary = "删除订单") @Parameter(name = "id", description = "编号", required = true) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/BatchOrderUpdateReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/BatchOrderUpdateReqVO.java new file mode 100644 index 000000000..a8c2b400e --- /dev/null +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/BatchOrderUpdateReqVO.java @@ -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 ids; + private Boolean status; +} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderBaseVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderBaseVO.java index be86d0bfa..a20ccd48b 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderBaseVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderBaseVO.java @@ -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; diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java index 8adfbc846..a672ec54b 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderService.java @@ -91,4 +91,6 @@ public interface RechargeOrderService { ShoppingMemberOrderVO shoppingOrderCount(Integer type, Long loginUserId); List findPromoterDrawExcel(PromoterDrawReqExcelVO excelVO); + + Boolean updateByIds(BatchOrderUpdateReqVO updateReqVO); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index eee8767fb..975308f75 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -138,6 +138,17 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { return rechargeOrderMapper.findPromoterDrawExcel(excelVO); } + @Override + public Boolean updateByIds(BatchOrderUpdateReqVO updateReqVO) { + List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery().in(RechargeOrderDO::getId, updateReqVO.getIds())); + if (!CollectionUtils.isEmpty(orderDOS)) { + orderDOS.forEach(e -> { + e.setStatus(updateReqVO.getStatus()); + }); + } + return null; + } + @Override public PageResult findPromoterDrawPage(PromoterDrawReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml index 299df9a38..695cf9ce8 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml @@ -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 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/AppPromoterCreateReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/AppPromoterCreateReqVO.java index 55ce24a60..05cea1126 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/AppPromoterCreateReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/AppPromoterCreateReqVO.java @@ -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; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterBaseVO.java index d550dbad9..d9bbe3c88 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterBaseVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterBaseVO.java @@ -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;