suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-05-08 11:45:36 +08:00
parent 70e0368118 78e59e435c
commit bcba7edd1e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
* @注释: * @注释:
*/ */
@Data @Data
public class PlanListRequest extends PageBasicInfo { public class PlanListRequest {
@ApiModelProperty("店铺名称") @ApiModelProperty("店铺名称")
private String shopName; private String shopName;
@ApiModelProperty("起始日期") @ApiModelProperty("起始日期")
@@ -26,5 +26,9 @@ public class PlanListRequest extends PageBasicInfo {
private List<String> regionIds; private List<String> regionIds;
@ApiModelProperty("审核状态") @ApiModelProperty("审核状态")
private Integer resultType; private Integer resultType;
@ApiModelProperty ("页码")
private Integer pageNumber;
@ApiModelProperty ("分页大小")
private Integer pageSize;
} }

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -72,7 +72,6 @@ public class FirstOrderServiceImp implements FirstOrderService {
//第一次提交 //第一次提交
order.setCreateTime(new Date()); order.setCreateTime(new Date());
order.setCreateUserId(userId); order.setCreateUserId(userId);
order.setUpdateUserId(userId);
num = firstOrderDAO.insertFirstOrder(order); num = firstOrderDAO.insertFirstOrder(order);
} else { } else {
//修改只更新下面2个 //修改只更新下面2个

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -133,7 +133,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
@Override @Override
public PageInfo<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request) { public PageInfo<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request) {
log.info("getPlanListPage request:{}", JSONObject.toJSONString(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,提交时间，审核状态 //去shop_info表查询店铺名字，店铺code，开店负责人id，督导id，区域id，lineinfo 加盟商name，手机号，招商经理id,open_plan,提交时间，审核状态
//TODO 拆表 产品沟通限定时间 //TODO 拆表 产品沟通限定时间
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = openingOperationPlanDAO.getOpenPlanShopListByCondition(request); List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = openingOperationPlanDAO.getOpenPlanShopListByCondition(request);