Merge branch 'feature/mall_product'

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java

@@ -65,12 +65,21 @@ public class RechargeOrderController {
 
     @PutMapping("/update")
     @Operation(summary = "更新订单")
+    @TenantIgnore
     @PreAuthorize("@ss.hasPermission('shop:recharge-order:update')")
     public CommonResult<Boolean> updateRechargeOrder(@Valid @RequestBody RechargeOrderUpdateReqVO updateReqVO) {
         rechargeOrderService.updateRechargeOrder(updateReqVO);
         return success(true);
     }
 
+    @PostMapping("/updateByIds")
+    @Operation(summary = "批量更新订单状态")
+    @TenantIgnore
+    public CommonResult<Boolean> updateByIds(@Valid @RequestBody BatchOrderUpdateReqVO updateReqVO) {
+        rechargeOrderService.updateByIds(updateReqVO);
+        return success(true);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除订单")
     @Parameter(name = "id", description = "编号", required = true)

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<Long> ids;
+    private Boolean status;
+}

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;
 

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<PromoterDrawExcelVO> findPromoterDrawExcel(PromoterDrawReqExcelVO excelVO);
+
+    Boolean updateByIds(BatchOrderUpdateReqVO updateReqVO);
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java

@@ -2,19 +2,23 @@ package cn.iocoder.yudao.module.shop.service.recharge;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.AppUserInfoReqDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
 import cn.iocoder.yudao.module.shop.controller.app.member.vo.PromoterMemberOrderVO;
 import cn.iocoder.yudao.module.shop.controller.app.member.vo.ShoppingMemberOrderVO;
+import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderConvert;
+import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
 import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
 import cn.iocoder.yudao.module.shop.dal.mysql.order.StoreOrderMapper;
 import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderInfoMapper;
+import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
 import cn.iocoder.yudao.module.shop.request.member.MemberChangeTieRequest;
-import cn.iocoder.yudao.module.shop.request.member.RefundRequest;
 import cn.iocoder.yudao.module.shop.response.member.MemberHeadResponse;
 import cn.iocoder.yudao.module.system.api.tenant.TenantApi;
 import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO;
@@ -23,32 +27,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.DayOfWeek;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
-import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
-import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderConvert;
-import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
-
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.shop.enums.ErrorCodeConstants.*;
-import static java.util.stream.Collectors.toMap;
+import static cn.iocoder.yudao.module.shop.enums.ErrorCodeConstants.RECHARGE_ORDER_NOT_EXISTS;
 
 /**
  * 订单 Service 实现类
@@ -138,6 +133,18 @@ 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());
+            });
+            rechargeOrderMapper.updateBatch(orderDOS, orderDOS.size());
+        }
+        return Boolean.TRUE;
+    }
+
     @Override
     public PageResult<PromoterDrawVO> findPromoterDrawPage(PromoterDrawReqVO pageReqVO) {
         Page<PromoterDrawVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());

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
@@ -263,7 +264,9 @@
             <if test="data.promoterId !=null ">
                 and a.promoter_id =#{data.promoterId}
             </if>
-
+            <if test="data.status !=null ">
+                and a.status =#{data.status}
+            </if>
         </where>
     </sql>
 </mapper>

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;
 
 

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;
 
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java

@@ -145,6 +145,7 @@ public class PromoterServiceImpl implements PromoterService {
         } else {
             memberUserDO.setMobile(updateReqVO.getMobile());
             memberUserDO.setNickname(updateReqVO.getNickname());
+            memberUserDO.setTenantId(updateReqVO.getTenantId());
             memberUserService.updateById(memberUserDO);
         }
     }