Merge branch 'release/merge-0529'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 9c815454c591c66c0aaa0fba0d36d6b71741b09d
+  newTag: 29417a8a3bf09199686a50795a2a7721eed0a0d6

src/main/java/com/mmc/pms/controller/RentalOrdersController.java

-package com.mmc.pms.controller;
-
-import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.OrderInfoDTO;
-import com.mmc.pms.model.qo.OrderInfoQO;
-import com.mmc.pms.service.RentalOrdersService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @Author small @Date 2023/5/25 9:42 @Version 1.0
- */
-@Api(tags = {"租赁相关-接口"})
-@RestController
-@RequestMapping("/RentalOrders")
-public class RentalOrdersController {
-
-  @Autowired private RentalOrdersService rentalOrdersService;
-
-  @ApiOperation(value = "租赁订单-分页-列表")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
-  @PostMapping("listPcWechatOrder")
-  public ResultBody listPcWechatOrder(HttpServletRequest request, @RequestBody OrderInfoQO param) {
-    return ResultBody.success(
-        // this.getCurrentAccount(request)
-        rentalOrdersService.listPcOrderInfo(param, null));
-  }
-
-  @ApiOperation(value = "小程序-云仓-订单-分页-列表")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
-  @PostMapping("listPageWechatOrder")
-  public ResultBody listPageWechatOrder(
-      HttpServletRequest request, @RequestBody OrderInfoQO param) {
-    return ResultBody.success(rentalOrdersService.listPageWechatOrder(null, param));
-  }
-}

src/main/java/com/mmc/pms/dao/RentalOrdersDao.java

-package com.mmc.pms.dao;
-
-import com.mmc.pms.entity.OrderInfoDO;
-import com.mmc.pms.model.qo.OrderInfoQO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/25 10:01 @Version 1.0
- */
-@Mapper
-public interface RentalOrdersDao {
-  Integer countPcOrderInfo(OrderInfoQO param);
-
-  List<OrderInfoDO> listPcOrderInfo(OrderInfoQO param);
-
-  int countPageOrderInfo(OrderInfoQO param);
-
-  List<OrderInfoDO> listPageOrderInfo(OrderInfoQO param);
-}

src/main/java/com/mmc/pms/model/qo/OrderInfoQO.java

-package com.mmc.pms.model.qo;
-
-import com.mmc.pms.common.Page;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/25 9:52 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.qo.OrderInfoQO", description = "订单QO")
-public class OrderInfoQO implements Serializable {
-  private static final long serialVersionUID = -3503119623575892302L;
-
-  @ApiModelProperty(value = "用户ID", hidden = true)
-  private Integer repoAccountId;
-
-  @ApiModelProperty(value = "关键字")
-  private String keyword;
-
-  @ApiModelProperty(value = "pc-买家账号")
-  private String keyword1;
-
-  @ApiModelProperty(value = "pc-订单编号")
-  private String keyword2;
-
-  @ApiModelProperty(value = "pc-商品编号")
-  private String keyword3;
-
-  @ApiModelProperty(value = "pc-商品名称")
-  private String keyword4;
-
-  @ApiModelProperty(value = "订单状态：查字典")
-  private String tranStatus;
-
-  @ApiModelProperty(value = "pc-开始时间")
-  private String startTime;
-
-  @ApiModelProperty(value = "pc-结束时间")
-  private String endTime;
-
-  @ApiModelProperty(value = "用户ID", hidden = true)
-  private List<Integer> userIds;
-
-  @ApiModelProperty(value = "单位ID", hidden = true)
-  private List<Integer> companys;
-
-  @ApiModelProperty(value = "页码", required = true)
-  @NotNull(
-      message = "页码不能为空",
-      groups = {Page.class})
-  @Min(value = 1, groups = Page.class)
-  private Integer pageNo;
-
-  @ApiModelProperty(value = "每页显示数", required = true)
-  @NotNull(
-      message = "每页显示数不能为空",
-      groups = {Page.class})
-  @Min(value = 1, groups = Page.class)
-  private Integer pageSize;
-
-  public void buildCurrentPage() {
-    this.pageNo = (pageNo - 1) * pageSize;
-  }
-}

src/main/java/com/mmc/pms/service/Impl/RentalOrdersServiceImpl.java

-package com.mmc.pms.service.Impl;
-
-import com.mmc.pms.dao.RentalOrdersDao;
-import com.mmc.pms.model.dto.BaseAccountDTO;
-import com.mmc.pms.model.dto.OrderInfoDTO;
-import com.mmc.pms.model.qo.OrderInfoQO;
-import com.mmc.pms.page.PageResult;
-import com.mmc.pms.service.RentalOrdersService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author small @Date 2023/5/25 9:44 @Version 1.0
- */
-@Service
-public class RentalOrdersServiceImpl implements RentalOrdersService {
-  @Autowired private RentalOrdersDao rentalOrdersDao;
-
-  @Override
-  public PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser) {
-    if (!cuser.isManage()) {
-      param.setCompanys(cuser.getCompanyInfo().getCompanys());
-    }
-    Integer count = rentalOrdersDao.countPcOrderInfo(param);
-    if (count == 0) {
-      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
-    }
-    Integer pageNo = param.getPageNo();
-    param.buildCurrentPage();
-    List<OrderInfoDTO> data =
-        rentalOrdersDao.listPcOrderInfo(param).stream()
-            .map(
-                d -> {
-                  return d.buildOrderInfoDTO();
-                })
-            .collect(Collectors.toList());
-    return PageResult.buildPage(pageNo, param.getPageSize(), count, data);
-  }
-
-  @Override
-  public PageResult listPageWechatOrder(BaseAccountDTO account, OrderInfoQO param) {
-    param.setRepoAccountId(account.getId());
-    int count = rentalOrdersDao.countPageOrderInfo(param);
-    if (count == 0) {
-      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
-    }
-    Integer pageNo = param.getPageNo();
-    param.buildCurrentPage();
-    List<OrderInfoDTO> data =
-        rentalOrdersDao.listPageOrderInfo(param).stream()
-            .map(
-                d -> {
-                  return d.buildOrderInfoDTO();
-                })
-            .collect(Collectors.toList());
-    return PageResult.buildPage(pageNo, param.getPageSize(), count, data);
-  }
-}

src/main/java/com/mmc/pms/service/RentalOrdersService.java

-package com.mmc.pms.service;
-
-import com.mmc.pms.model.dto.BaseAccountDTO;
-import com.mmc.pms.model.qo.OrderInfoQO;
-import com.mmc.pms.page.PageResult;
-
-/**
- * @Author small @Date 2023/5/25 9:44 @Version 1.0
- */
-public interface RentalOrdersService {
-  PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser);
-
-  PageResult listPageWechatOrder(BaseAccountDTO account, OrderInfoQO param);
-}

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
     password: MMC@2022&MYSQL
   redis:
     database: 3
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: redis.default
     port: 6379
     password: MMC@2022&REDIS
     jedis:

src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ spring:
     password: MMC@2022&MYSQL
   redis:
     database: 3
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: redis.default
     port: 6379
     password: MMC@2022&REDIS
     jedis: