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

feat:自有店逻辑修改

Browse Source
This commit is contained in:
苏竹红
2025-05-15 14:01:44 +08:00
parent 9e324de66f
commit 14035dee4b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
View File

@@ -1,7 +1,9 @@
package com.cool.store.request;
import com.cool.store.entity.OrderSysInfoDO;
import com.cool.store.enums.JoinModeEnum;
import com.cool.store.enums.OrderSysTypeEnum;
import com.cool.store.enums.SignTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
@@ -115,13 +117,17 @@ public class OrderSysInfoRequest {
return orderSysInfoDO;
}
public Boolean check(){
public Boolean check(Integer joinMode){
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){
return false;
}
}
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
//自由店只需要门店编码
if (Objects.equals(joinMode, JoinModeEnum.OWN_STORE.getCode())&&this.shopCode!=null){
return true;
}
if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
return false;
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
View File

@@ -9,10 +9,12 @@ import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.FranchiseFeeMapper;
import com.cool.store.mapper.SignFranchiseMapper;
import com.cool.store.request.AuditRequest;
import com.cool.store.request.OrderSysInfoRequest;
import com.cool.store.service.OperationLogService;
import com.cool.store.service.OrderSysInfoService;
import com.cool.store.service.SignFranchiseService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.poi.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -73,7 +75,8 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
String curUserId = user.getUserId();
String curName = user.getName();
//参数校验
if (!request.check()) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
if (!request.check(shopInfo.getJoinMode())) {
throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
}
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());