From 5edec66ab154253fe6470f8beb41e1a2c94cbfcf Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 8 May 2024 11:35:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=B4=A7?= =?UTF-8?q?=E9=87=91bug=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/FirstOrderServiceImp.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 515efb409..694c5867a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -72,7 +72,6 @@ public class FirstOrderServiceImp implements FirstOrderService { //第一次提交 order.setCreateTime(new Date()); order.setCreateUserId(userId); - order.setUpdateUserId(userId); num = firstOrderDAO.insertFirstOrder(order); } else { //修改只更新下面2个 From 78e59e435cec0aff72dc34c8337903c1bed45031 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 8 May 2024 11:42:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8pageNumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/request/PlanListRequest.java | 6 +++++- .../cool/store/service/impl/OpeningOperationPlanImpl.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java index b5508f57f..f05115208 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java @@ -15,7 +15,7 @@ import java.util.List; * @注释: */ @Data -public class PlanListRequest extends PageBasicInfo { +public class PlanListRequest { @ApiModelProperty("店铺名称") private String shopName; @ApiModelProperty("起始日期") @@ -26,5 +26,9 @@ public class PlanListRequest extends PageBasicInfo { private List regionIds; @ApiModelProperty("审核状态") private Integer resultType; + @ApiModelProperty ("页码") + private Integer pageNumber; + @ApiModelProperty ("分页大小") + private Integer pageSize; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index a69554f73..d55d59aab 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -133,7 +133,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { @Override public PageInfo getPlanListPage(PlanListRequest request) { log.info("getPlanListPage request:{}", JSONObject.toJSONString(request)); - PageHelper.startPage(request.getPageNum(), request.getPageSize()); + PageHelper.startPage(request.getPageNumber(), request.getPageSize()); //去shop_info表查询店铺名字，店铺code，开店负责人id，督导id，区域id，lineinfo 加盟商name，手机号，招商经理id,open_plan,提交时间，审核状态 //TODO 拆表 产品沟通限定时间 List openPlanShopInfoDTOS = openingOperationPlanDAO.getOpenPlanShopListByCondition(request);