代理类型字段修改

src/main/java/org/springblade/modules/ldt/agenter/entity/Agenter.java

@@ -48,10 +48,10 @@ public class Agenter extends BaseEntity {
 		@ApiModelProperty(value = "代理人手机号码")
 		private String userPhone;
 	/**
-	* 代理人级别： 1-独家代理 2-战略合作伙伴
+	* 代理人类型
 	*/
-		@ApiModelProperty(value = "代理人级别： 1-独家代理 2-战略合作伙伴")
-		private Integer level;
+		@ApiModelProperty(value = "代理人类型")
+		private Long agenterTypeId;
 	/**
 	* -1: 禁用 1: 启用
 	*/

src/main/java/org/springblade/modules/ldt/agenter/mapper/AgenterMapper.xml

@@ -14,7 +14,7 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="user_id" property="userId"/>
         <result column="user_phone" property="userPhone"/>
-        <result column="level" property="level"/>
+        <result column="agenter_type_id" property="agenterTypeId"/>
         <result column="enabled" property="enabled"/>
         <result column="province" property="province"/>
         <result column="city" property="city"/>

src/main/java/org/springblade/modules/ldt/agentertype/controller/AgenterTypeController.java

@@ -128,21 +128,21 @@ public class AgenterTypeController extends BladeController {
 		return R.status(agenterTypeService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	/**
-	 *
-	 */
-	@GetMapping("/getAgenterTypeByAreaCode")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R<AgenterType> getAgenterTypeByAreaCode(String areaCode){
-		Region region = regionService.getByCode(areaCode);
-		Assert.notNull(region,"城市不存在");
-		Assert.isTrue(region.getRegionLevel() == 2,"城市不存在");
-		AgenterType agenterType = agenterTypeService.getBaseMapper().selectOne(new QueryWrapper<>(new AgenterType()).lambda().eq(AgenterType::getCityRank, region.getCityRank()));
-		Assert.notNull(agenterType,"该城市类型不存在");
-		Assert.notNull(agenterType.getCost(),"该城市类型的代理应付还未设置");
-		return R.data(agenterType);
-	}
+//	/**
+//	 *
+//	 */
+//	@GetMapping("/getAgenterTypeByAreaCode")
+//	@ApiOperationSupport(order = 7)
+//	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+//	public R<AgenterType> getAgenterTypeByAreaCode(String areaCode){
+//		Region region = regionService.getByCode(areaCode);
+//		Assert.notNull(region,"城市不存在");
+//		Assert.isTrue(region.getRegionLevel() == 2,"城市不存在");
+//		AgenterType agenterType = agenterTypeService.getBaseMapper().selectOne(new QueryWrapper<>(new AgenterType()).lambda());
+//		Assert.notNull(agenterType,"该城市类型不存在");
+//		Assert.notNull(agenterType.getCost(),"该城市类型的代理应付还未设置");
+//		return R.data(agenterType);
+//	}
 
 
 }

src/main/java/org/springblade/modules/ldt/agentertype/entity/AgenterType.java

@@ -51,7 +51,7 @@ public class AgenterType extends BaseEntity {
 	/**
 	* 推广分红比例
 	*/
-		@ApiModelProperty(value = "推广分红比例")
+		@ApiModelProperty(value = "推广商店分红比例")
 		private BigDecimal recommendRate;
 	/**
 	* 成为该类型需要支付多少钱
@@ -59,11 +59,7 @@ public class AgenterType extends BaseEntity {
 		@ApiModelProperty(value = "成为该类型需要支付多少钱")
 		private BigDecimal cost;
 
-	/**
-	 * 城市级别
-	 */
-	@ApiModelProperty(value = "城市级别")
-	private Integer cityRank;
+
 
 
 }

src/main/java/org/springblade/modules/ldt/agentertype/mapper/AgenterTypeMapper.xml

@@ -16,7 +16,6 @@
         <result column="city_rate" property="cityRate"/>
         <result column="recommend_rate" property="recommendRate"/>
         <result column="cost" property="cost"/>
-        <result column="city_rank" property="cityRank"/>
     </resultMap>
 
 

src/main/java/org/springblade/modules/ldt/loginuser/entity/LoginUser.java

@@ -93,9 +93,9 @@ public class LoginUser extends BaseEntity {
 	private Integer point;
 
 	/**
-	 * 城市
+	 * 余额
 	 */
-	@ApiModelProperty(value = "城市")
+	@ApiModelProperty(value = "余额")
 	private BigDecimal pointValue;