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

fix

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-29 14:16:42 +08:00
parent 4b00acf753
commit 1928d44fee
13 changed files with 122 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java
View File

@@ -233,18 +233,6 @@ public class PointDetailInfoDO {
@Column(name = "month_profit_rate")
private String monthProfitRate;
/**
* 配送费率
*/
@Column(name = "delivery_rate")
private String deliveryRate;
/**
* 配送费
*/
@Column(name = "delivery_fee")
private String deliveryFee;
/**
* 品牌使用费率
*/

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

@@ -193,12 +193,6 @@ public class AddPointDetailRequest {
@ApiModelProperty("门店月毛利率")
private String monthProfitRate;
@ApiModelProperty("配送费率")
private String deliveryRate;
@ApiModelProperty("配送费")
private String deliveryFee;
@ApiModelProperty("品牌使用费率")
private String brandUseRate;
@@ -269,8 +263,6 @@ public class AddPointDetailRequest {
result.setDayTrader(request.getDayTrader());
result.setProfitRate(request.getProfitRate());
result.setMonthProfitRate(request.getMonthProfitRate());
result.setDeliveryRate(request.getDeliveryRate());
result.setDeliveryFee(request.getDeliveryFee());
result.setBrandUseRate(request.getBrandUseRate());
result.setBrandUseFee(request.getBrandUseFee());
result.setStaffFee(request.getStaffFee());

2
coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java
View File

@@ -56,8 +56,6 @@ public class UpdatePointDetailRequest extends AddPointDetailRequest {
result.setDayTrader(request.getDayTrader());
result.setProfitRate(request.getProfitRate());
result.setMonthProfitRate(request.getMonthProfitRate());
result.setDeliveryRate(request.getDeliveryRate());
result.setDeliveryFee(request.getDeliveryFee());
result.setBrandUseRate(request.getBrandUseRate());
result.setBrandUseFee(request.getBrandUseFee());
result.setStaffFee(request.getStaffFee());

16
coolstore-partner-model/src/main/java/com/cool/store/vo/point/MiniPointPageVO.java
View File

@@ -55,23 +55,9 @@ public class MiniPointPageVO {
pointPageVO.setAddress(pointInfo.getAddress());
pointPageVO.setPointScore(pointInfo.getPointScore());
pointPageVO.setPointArea(pointInfo.getPointArea());
pointPageVO.setRecommendStatus(getRecommendStatus(curLineId, pointInfo.getLineId(), pointInfo.getPointStatus(), pointInfo.getSelectStatus(), pointInfo.getRecommendStatus()));
pointPageVO.setRecommendStatus(pointInfo.getRecommendStatus());
resultList.add(pointPageVO);
}
return resultList;
}
public static Integer getRecommendStatus(Long curLineId, Long lineId, Integer pointStatus, Integer selectStatus, Integer recommendStatus) {
if(PointStatusEnum.POINT_STATUS_7.getCode().equals(pointStatus)){
return PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6.getCode();
}
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(selectStatus)){
//已选择 判断线索id是否是自己
if(curLineId.equals(lineId)){
return PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode();
}
return PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode();
}
return recommendStatus;
}
}

8
coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java
View File

@@ -164,12 +164,6 @@ public class PointDetailVO {
@ApiModelProperty("门店月毛利率")
private String monthProfitRate;
@ApiModelProperty("配送费率")
private String deliveryRate;
@ApiModelProperty("配送费")
private String deliveryFee;
@ApiModelProperty("品牌使用费率")
private String brandUseRate;
@@ -315,8 +309,6 @@ public class PointDetailVO {
result.setDayTrader(pointDetailInfo.getDayTrader());
result.setProfitRate(pointDetailInfo.getProfitRate());
result.setMonthProfitRate(pointDetailInfo.getMonthProfitRate());
result.setDeliveryRate(pointDetailInfo.getDeliveryRate());
result.setDeliveryFee(pointDetailInfo.getDeliveryFee());
result.setBrandUseRate(pointDetailInfo.getBrandUseRate());
result.setBrandUseFee(pointDetailInfo.getBrandUseFee());
result.setStaffFee(pointDetailInfo.getStaffFee());