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

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-21 10:42:02 +08:00
parent 3182f050af 194e4aefa8
commit cca3d71b25
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java
View File

@@ -17,4 +17,11 @@ public interface SignFranchiseService {
AddSignFranchiseResponse getSignFranchise(Long shopId); AddSignFranchiseResponse getSignFranchise(Long shopId);
/**
* 加盟合同退回后重新缴费
* @param shopId
* @return
*/
Boolean rePay(Long shopId);
} }

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -7,6 +7,7 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.*; import com.cool.store.enums.*;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.*; import com.cool.store.mapper.*;
@@ -414,4 +415,13 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
public static String getDateTimeFormat(String pattern, Date date) { public static String getDateTimeFormat(String pattern, Date date) {
return new SimpleDateFormat(pattern).format(date); return new SimpleDateFormat(pattern).format(date);
} }
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean rePay(Long shopId) {
shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71);
shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_7);
return true;
}
} }

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
View File

@@ -33,4 +33,10 @@ public class PCSignFranchiseController {
return ResponseResult.success(signFranchiseService.getSignFranchise(shopId)); return ResponseResult.success(signFranchiseService.getSignFranchise(shopId));
} }
@ApiOperation("重新缴费(加盟合同阶段退回后)")
@GetMapping("/rePay")
public ResponseResult<Boolean> rePay(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(signFranchiseService.rePay(shopId));
}
} }

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java
View File

@@ -33,4 +33,10 @@ public class MiniSignFranchiseController {
return ResponseResult.success(signFranchiseService.getSignFranchise(shopId)); return ResponseResult.success(signFranchiseService.getSignFranchise(shopId));
} }
@ApiOperation("重新缴费(加盟合同阶段退回后)")
@GetMapping("/rePay")
public ResponseResult<Boolean> rePay(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(signFranchiseService.rePay(shopId));
}
} }