From 682dda4557e23289efda671231ac8f54f8e80124 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 22 May 2024 16:56:49 +0800 Subject: [PATCH 1/4] fix --- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index f4fd52cd3..2211d3cd3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -421,7 +421,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Override @Transactional(rollbackFor = Exception.class) public Boolean rePay(Long shopId) { - shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71); + shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_74); shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8); return true; } From bafc49a4623e2df45da5bcc615d648c2267fde36 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 22 May 2024 17:12:06 +0800 Subject: [PATCH 2/4] api --- .../main/java/com/cool/store/response/FranchiseFeeResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java index b22b6d701..616d4039c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java @@ -115,7 +115,7 @@ public class FranchiseFeeResponse { @ApiModelProperty("审核原因") private String result; - @ApiModelProperty("审核状态") + @ApiModelProperty("审核状态 0通过,1拒绝") private Integer status; public static LinePay from(LinePayDO linePayDO) { From 7ef49f946f97a0dd6597c2bb96936ebe512ffdd7 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Wed, 22 May 2024 19:34:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AE=A1=E8=BE=96=E5=A4=A7=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/TempUserDetailServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index a85a1846f..481f93096 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -2,10 +2,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.dto.ehr.StaffBaseInfoDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.ShopInfoDO; -import com.cool.store.entity.ShopStageInfoDO; -import com.cool.store.entity.TempUserDetailDO; +import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.UserRoleEnum; @@ -59,6 +56,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { @Autowired private PreparationService preparationService; + @Autowired + private RegionDao regionDao; + @Override public TempUserDetailListVO userList(Long shopId) { List tempUserDetailDOList = tempUserDetailDAO.userList(shopId); @@ -138,8 +138,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { } List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); + RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); // - userIdList = enterpriseUserDAO.getUserIdListByRegionId(shopInfoDO.getRegionId(), userIdList); + userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), userIdList); Map messageMap = new HashMap<>(); messageMap.put("userName", tempUserDetailRequest.getName()); From 8226622a3eaed5c4cf2265c36d82e7f8cab72ce1 Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 23 May 2024 09:35:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=86=85=E9=83=A8=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=B8=8Eapi=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/FranchiseeSaveRequest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java index 31c34fd61..4f85b15d2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java @@ -47,7 +47,11 @@ public class FranchiseeSaveRequest { franchiseeDO.setIdCardAddress(this.idCardAddress); franchiseeDO.setIdCardBackUrl(this.idCardBackUrl); franchiseeDO.setIdCardFrontUrl(this.idCardFrontUrl); - franchiseeDO.setSex(this.sex); + if (this.sex == 1){ + franchiseeDO.setSex(1); + }else if (this.sex == 2){ + franchiseeDO.setSex(0); + } franchiseeDO.setSignType(this.signType); return franchiseeDO; }