From d47550f8dfb42cec3c8f41cd1b29049f9d3176dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Mon, 10 Jul 2023 17:14:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=9B=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserAppController.java | 11 +++++ .../platform/mapper/UserMarkerMapper.java | 9 +++++ .../cn/pluss/platform/entity/UserMarker.java | 34 ++++++++++++++++ .../impl/MerchantProfitServiceImpl.java | 2 +- .../platform/userApp/UserAppService.java | 4 ++ .../userApp/impl/UserAppServiceImpl.java | 40 +++++++++++++++++++ 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMarkerMapper.java create mode 100644 pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMarker.java diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index 32ee437..8101ebe 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -1746,4 +1746,15 @@ public class UserAppController { UserApp info = userAppService.getUserAppByPhone(phone, userApp); return ResultGenerator.genSuccessResult("操作成功", info); } + + /** + * 申请 + * @return + */ + @PostMapping(value = "applyMarker") + public Result applyMarker(){ + UserApp userApp = userAppService.checkApiToken(); + userAppService.applyMarker(userApp); + return ResultGenerator.genSuccessResult("申请成功"); + } } diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMarkerMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMarkerMapper.java new file mode 100644 index 0000000..2835c08 --- /dev/null +++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMarkerMapper.java @@ -0,0 +1,9 @@ +package cn.pluss.platform.mapper; + +import cn.pluss.platform.entity.UserMarker; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserMarkerMapper extends BaseMapper { +} diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMarker.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMarker.java new file mode 100644 index 0000000..597814a --- /dev/null +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMarker.java @@ -0,0 +1,34 @@ +package cn.pluss.platform.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +@Data +@Accessors(chain = true) +public class UserMarker implements Serializable { + + @TableField("user_id") + private Integer userId; + + @TableField("name") + private String name; + + @TableField("phone") + private String phone; + + @TableField("status") + private String status; + + @TableField("remark") + private String remark; + + @TableField("create_time") + private Date createTime; + + @TableField("update_time") + private Date updateTime; +} diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java index ef1b3f9..7705deb 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java @@ -179,7 +179,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl { * @return */ UserApp getUserAppByPhone(String phone, UserApp userApp); + + + void applyMarker(UserApp userApp); + } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index 2da0dbd..09ae251 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -1,5 +1,6 @@ package cn.pluss.platform.userApp.impl; +import cn.hutool.core.util.ObjectUtil; import cn.pluss.platform.IdCardService; import cn.pluss.platform.ali.AliService; import cn.pluss.platform.api.PageInfo; @@ -1911,4 +1912,43 @@ public class UserAppServiceImpl extends ServiceImpl impl MsgException.check(userApp.getUserId().equals(app.getUserId()), "无法选择自己"); return app; } + + + @Autowired + @Lazy + UserMarkerMapper userMarkerMapper; + + @Autowired + @Lazy + UserPromotionMapper userPromotionMapper; + @Override + public void applyMarker(UserApp userApp) { + + UserMarker marker= userMarkerMapper.selectById(userApp.getUserId()); + if(ObjectUtil.isNotEmpty(marker)){ + if(marker.getStatus().equals("2")){ + marker.setStatus("0"); + }else { + MsgException.checkNull(null,"等待审核完成之后再申请"); + } + + }else { + marker=new UserMarker(); + marker.setName(userApp.getUserName()); + marker.setPhone(userApp.getPhone()); + marker.setUserId(userApp.getUserId().intValue()); + marker.setStatus("0"); + marker.setCreateTime(new Date()); + userMarkerMapper.insert(marker); + } + + UserPromotion userPromotion= userPromotionMapper.selectById(userApp.getUserId()); + if(ObjectUtil.isEmpty(userPromotion)){ + MsgException.checkNull(null,"用户信息错误"); + } + + userPromotion.setIsExtend("3"); + userPromotion.setUpdateTime(new Date()); + userPromotionMapper.updateById(userPromotion); + } } \ No newline at end of file