From f6d8bd2f31bca368fc0ade3588e4e20f16e2eff9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 Apr 2023 11:56:24 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java | 14 ++++++++++----
src/main/java/cc/mrbird/febs/common/enumerates/AgentLevelEnum.java | 6 +++---
src/main/java/cc/mrbird/febs/mall/dto/ApiAgentApplyDto.java | 4 ++++
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/AgentLevelEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/AgentLevelEnum.java
index 1589fde..14acec7 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/AgentLevelEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/AgentLevelEnum.java
@@ -10,9 +10,9 @@
public enum AgentLevelEnum {
ZERO_LEVEL("非会员"),
- LEVEL_TWO("非会员"),
- LEVEL_ONE("非会员"),
- LEVEL_THREE("非会员"),
+ LEVEL_TWO("LEVEL_TWO"),
+ LEVEL_ONE("LEVEL_ONE"),
+ LEVEL_THREE("LEVEL_THREE"),
FIRST_LEVEL("普通会员"),
SECOND_LEVEL("区级代理"),
THIRD_LEVEL("市级代理"),
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 82d504f..678afeb 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -86,6 +86,7 @@
data.setExpressCom(mallExpressInfo.getExpressCom());
}else{
data.setExpressCom("极兔快递");
+ data.setExpressNo("JT");
}
model.addAttribute("deliverInfo", data);
return FebsUtil.view("modules/order/deliverGoods");
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiAgentApplyDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiAgentApplyDto.java
index 45596ae..36a1e5e 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiAgentApplyDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiAgentApplyDto.java
@@ -37,5 +37,9 @@
@NotBlank(message = "详细地址不能为空")
@ApiModelProperty(value = "详细地址")
private String storeAddress;
+ //详细地址
+ @NotBlank(message = "等级不能为空")
+ @ApiModelProperty(value = "合伙人等级")
+ private String type;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java
index d85c377..280a6c8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAgentServiceImpl.java
@@ -54,15 +54,21 @@
// return new FebsResponse().fail().message("当前城市已经无法申请");
// }
- MallAgentRecord mallAgentRecordNew = MallAgentRecordConversion.INSTANCE.dtoToEntity(apiAgentApplyDto);
- mallAgentRecordNew.setMemberId(memberId);
- mallAgentRecordNew.setState(MallAgentRecord.APPLY_ING);
- mallAgentRecordMapper.insert(mallAgentRecordNew);
DataDictionaryCustom agentAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType()
, DataDictionaryEnum.PRICE_AMOUNT.getCode());
String agentAmount = agentAmountDic.getValue();
BigDecimal bigDecimal = new BigDecimal(agentAmount);
+
+ MallAgentRecord mallAgentRecordNew = MallAgentRecordConversion.INSTANCE.dtoToEntity(apiAgentApplyDto);
+ mallAgentRecordNew.setMemberId(memberId);
+ mallAgentRecordNew.setState(MallAgentRecord.APPLY_ING);
+ if(apiAgentApplyDto.getType().equals(AgentLevelEnum.LEVEL_THREE.getName())){
+ mallAgentRecordNew.setAmount(bigDecimal);
+ mallAgentRecordNew.setAgentLevel(AgentLevelEnum.LEVEL_THREE.getName());
+ }
+ mallAgentRecordMapper.insert(mallAgentRecordNew);
return new FebsResponse().success().data(bigDecimal);
}
+
}
--
Gitblit v1.9.1