From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java | 2
framework/src/main/java/cn/lili/modules/lmk/service/StoreMemberService.java | 67 +++
framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java | 34 ++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreMemberVO.java | 58 +++
buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java | 11
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java | 2
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 34 +
framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreMember.java | 35 ++
framework/src/main/java/cn/lili/modules/lmk/mapper/StoreMemberMapper.java | 33 +
framework/src/main/java/cn/lili/modules/member/service/MemberService.java | 9
framework/src/main/java/cn/lili/modules/lmk/domain/entity/ActivityReport.java | 21 +
buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java | 43 ++
framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java | 169 +++++++++
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java | 112 +++++-
framework/src/main/resources/mapper/lmk/ActivityMapper.xml | 20 -
framework/src/main/resources/mapper/lmk/StoreMemberMapper.xml | 61 +++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java | 14
framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java | 15
framework/src/main/resources/mapper/lmk/ActivityReportMapper.xml | 23 +
framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityReportMapper.java | 23 +
lmk-job/src/main/java/cn/lili/job/ActivityJob.java | 14
buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java | 75 ++++
framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java | 11
framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java | 2
framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreMemberQuery.java | 22 +
framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java | 51 +++
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 15
27 files changed, 904 insertions(+), 72 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java
new file mode 100644
index 0000000..ff0bac3
--- /dev/null
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java
@@ -0,0 +1,43 @@
+package cn.lili.controller.lmk;
+
+import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
+import cn.lili.modules.lmk.service.ActivityService;
+import cn.lili.modules.lmk.service.MyActivityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Validated
+@RequiredArgsConstructor
+@Api(value = "灏忕▼搴忕娲诲姩绠＄悊", tags = "灏忕▼搴忕娲诲姩绠＄悊")
+@RestController
+@RequestMapping("/buyer/lmk/activityReport")
+public class ActivityReportController {
+
+ private final ActivityService activityService;
+
+ private final MyActivityService myActivityService;
+
+ @GetMapping()
+ @ApiOperation(value = "娲诲姩鍒楄〃", notes = "娲诲姩鍒楄〃")
+ public Result getAllActivity(){
+ return activityService.all();
+ }
+
+ @PostMapping()
+ @ApiOperation(value = "鎶ュ悕娲诲姩", notes = "娲诲姩鎶ュ悕")
+ public Result activityReport(@RequestBody ActivityReportForm activityReportForm){
+
+ return myActivityService.activityReport(activityReportForm);
+ }
+
+ @GetMapping("/getDetail/{activityId}")
+ @ApiOperation(value = "娲诲姩璇︽儏", notes = "娲诲姩璇︽儏")
+ public Result getActivityDetail(@PathVariable String activityId){
+ return myActivityService.detailByUsr(activityId);
+ }
+}
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
index e181ddc..723ea1c 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
@@ -1,6 +1,7 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
import cn.lili.modules.lmk.service.ActivityService;
@@ -21,15 +22,13 @@
@GetMapping("/getMyActivityList")
@ApiOperation(value = "鑾峰緱鎴戠殑娲诲姩鍒楄〃", notes = "鑾峰緱鎴戠殑娲诲姩鍒楄〃")
public Result getMyActivityList(MyActivityQuery query){
-
return myActivityService.getMyActivityList(query);
}
-
- @PutMapping("/cancelActivity")
- @ApiOperation(value = "鑾峰緱鎴戠殑娲诲姩鍒楄〃", notes = "鑾峰緱鎴戠殑娲诲姩鍒楄〃")
- public Result cancelActivity(@RequestBody ActivityReportQuery query){
- return myActivityService.cancelActivity(query);
+ @PutMapping("/activityCancel/{activityId}")
+ @ApiOperation(value = "鍙栨秷娲诲姩", notes = "鍙栨秷娲诲姩")
+ public Result activityCancel(@PathVariable String activityId){
+ return myActivityService.activityCancel(activityId);
}
}
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java
new file mode 100644
index 0000000..1336c10
--- /dev/null
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/StoreMemberController.java
@@ -0,0 +1,75 @@
+package cn.lili.controller.lmk;
+
+
+import cn.lili.base.Result;
+import cn.lili.group.Add;
+import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.form.StoreMemberForm;
+import cn.lili.modules.lmk.domain.query.StoreMemberQuery;
+import cn.lili.modules.lmk.service.StoreMemberService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗) 鍓嶇鎺у埗鍣�
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)", tags = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)绠＄悊")
+@RestController
+@RequestMapping("/buyer/lmk/lmk-user-permissions")
+public class StoreMemberController {
+ // store_member
+ private final StoreMemberService storeMemberService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) StoreMemberForm form) {
+ return storeMemberService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) StoreMemberForm form) {
+ return storeMemberService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return storeMemberService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return storeMemberService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(StoreMemberQuery query) {
+ return storeMemberService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return storeMemberService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return storeMemberService.all();
+ }
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/ActivityReport.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/ActivityReport.java
new file mode 100644
index 0000000..fd0d242
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/ActivityReport.java
@@ -0,0 +1,21 @@
+package cn.lili.modules.lmk.domain.entity;
+
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("lmk_activity_report")
+public class ActivityReport extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @TableField("activity_id")
+ private String activityId;
+
+ @TableField("user_id")
+ private String userId;
+
+ @TableField("cancel")
+ private Boolean cancel;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreMember.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreMember.java
new file mode 100644
index 0000000..c024434
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/StoreMember.java
@@ -0,0 +1,35 @@
+package cn.lili.modules.lmk.domain.entity;
+
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Data
+@TableName("lmk_store_member")
+public class StoreMember extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("real_name")
+ /** 鐪熷疄濮撳悕 */
+ private String realName;
+
+ @TableField("role")
+ /** 瑙掕壊 */
+ private String role;
+
+ @TableField("member_id")
+ /** 浼氬憳鐢ㄦ埛id */
+ private String memberId;
+ /** 鍟嗘埛id */
+ @TableField("store_id")
+ private String storeId;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java
new file mode 100644
index 0000000..2cfc624
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java
@@ -0,0 +1,34 @@
+package cn.lili.modules.lmk.domain.form;
+
+import cn.lili.base.AbsForm;
+import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(value = "鎶ュ悕娲诲姩琛ㄥ崟", description = "鎶ュ悕娲诲姩琛ㄥ崟")
+public class ActivityReportForm extends AbsForm {
+
+ /** 娲诲姩id */
+ @ApiModelProperty(value = "娲诲姩id")
+ @NotBlank
+ private String activityId;
+
+ /** 鏄惁鍙栨秷鎶ュ悕 */
+ @ApiModelProperty(value = "鍙栨秷閭ｆ姤鍚�")
+ private Boolean cancel;
+
+ public static ActivityReport getEntityByForm(@NonNull ActivityReportForm form, ActivityReport entity) {
+ if(entity == null) {
+ entity = new ActivityReport();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java
new file mode 100644
index 0000000..183348b
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/StoreMemberForm.java
@@ -0,0 +1,51 @@
+package cn.lili.modules.lmk.domain.form;
+
+import cn.lili.base.AbsForm;
+import cn.lili.group.Add;
+import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.entity.StoreMember;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)琛ㄥ崟
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Data
+@ApiModel(value = "LmkUserPermissions琛ㄥ崟", description = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)琛ㄥ崟")
+public class StoreMemberForm extends AbsForm {
+
+ @NotBlank(message = "鐪熷疄濮撳悕涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐪熷疄濮撳悕")
+ private String realName;
+
+ @NotBlank(message = "鐢佃瘽鍙风爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐢佃瘽鍙风爜")
+ private String mobile;
+
+ @NotBlank(message = "瀵嗙爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀵嗙爜")
+ private String password;
+
+
+ @NotBlank(message = "瑙掕壊涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瑙掕壊Json瀛楃涓�")
+ private String role;
+
+
+ public static StoreMember getEntityByForm(@NonNull StoreMemberForm form, StoreMember entity) {
+ if(entity == null) {
+ entity = new StoreMember();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java
index 5da2252..7c4bbcd 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/MyActivityQuery.java
@@ -16,7 +16,5 @@
/** 鏄惁鍙栨秷*/
private Boolean cancel;
- @NotBlank
- private String id;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreMemberQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreMemberQuery.java
new file mode 100644
index 0000000..b5f9686
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/StoreMemberQuery.java
@@ -0,0 +1,22 @@
+package cn.lili.modules.lmk.domain.query;
+
+import cn.lili.base.AbsQuery;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)鏌ヨ
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Data
+@ApiModel(value = "LmkUserPermissions鏌ヨ鍙傛暟", description = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)鏌ヨ鍙傛暟")
+public class StoreMemberQuery extends AbsQuery {
+
+ /** 鐪熷疄濮撳悕*/
+ private String realName;
+ /** 搴楅摵id */
+ private String storeId;
+}
+
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
index a2dfb23..df72a3d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
@@ -1,8 +1,12 @@
package cn.lili.modules.lmk.domain.vo;
import cn.lili.base.AbsVo;
+import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
@Data
@ApiModel(value = "ActivityReport涓棿琛ㄥ搷搴旀暟鎹�", description = "鍝嶅簲鏁版嵁")
@@ -12,4 +16,14 @@
/** 鐢ㄦ埛id*/
private String userId;
+
+ private Boolean cancel;
+
+ public static ActivityReportVO getVoByEntity(@NonNull ActivityReport entity, ActivityReportVO vo) {
+ if(vo == null) {
+ vo = new ActivityReportVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
index 1007010..a239abb 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
@@ -85,6 +85,8 @@
/** 鎶ュ悕浜哄憳闆嗗悎*/
private List<MemberVO> members;
+ private Boolean isReport;
+
public static ActivityVO getVoByEntity(@NonNull Activity entity, ActivityVO vo) {
if(vo == null) {
vo = new ActivityVO();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreMemberVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreMemberVO.java
new file mode 100644
index 0000000..6c462bd
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/StoreMemberVO.java
@@ -0,0 +1,58 @@
+package cn.lili.modules.lmk.domain.vo;
+
+
+import cn.lili.base.AbsVo;
+import cn.lili.modules.lmk.domain.entity.StoreMember;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)灞曠ず
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Data
+@ApiModel(value = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)鍝嶅簲鏁版嵁", description = "鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)鍝嶅簲鏁版嵁")
+public class StoreMemberVO extends AbsVo {
+
+ /** 鐢佃瘽 */
+ @ApiModelProperty("鐢佃瘽")
+ private String mobile;
+
+ /** 鐢ㄦ埛鍚� */
+ @ApiModelProperty("鐢ㄦ埛鍚�")
+ private String userName;
+
+ /** 鐪熷疄濮撳悕 */
+ @ApiModelProperty("鐪熷疄濮撳悕")
+ private String realName;
+
+ /** 瀵嗙爜 */
+ @ApiModelProperty("瀵嗙爜")
+ private String password;
+
+ /** 瑙掕壊 */
+ @ApiModelProperty("瑙掕壊")
+ private String role;
+
+ /** 鐢ㄦ埛id */
+ @ApiModelProperty("鐢ㄦ埛id")
+ private String memberId;
+
+ /** 搴楅摵id */
+ @ApiModelProperty("搴楅摵id")
+ private String storeId;
+
+ public static StoreMemberVO getVoByEntity(@NonNull StoreMember entity, StoreMemberVO vo) {
+ if(vo == null) {
+ vo = new StoreMemberVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
index ac7f14b..06e725b 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
@@ -1,7 +1,6 @@
package cn.lili.modules.lmk.mapper;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
import cn.lili.modules.lmk.domain.query.*;
import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
@@ -39,11 +38,7 @@
IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);
- List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query);
-
- int cancelActivity(String id);
-
- ActivityReportVO getActivityReport(@Param("query")ActivityReportQuery query);
+ List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query,@Param("userId") String userId);
/**
* 鎵归噺鏇存柊娲诲姩
@@ -51,4 +46,8 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
int batchUpdateActivities(@Param("list") List<Activity> activityList);
+
+
+
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityReportMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityReportMapper.java
new file mode 100644
index 0000000..50355c9
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityReportMapper.java
@@ -0,0 +1,23 @@
+package cn.lili.modules.lmk.mapper;
+
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
+import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 鎶ュ悕涓棿琛ㄦ帴鍙�
+ */
+@Mapper
+public interface ActivityReportMapper extends BaseMapper<ActivityReport> {
+
+ /**
+ * 鑾峰緱涓棿琛ㄧ殑淇℃伅
+ * @param activityId 娲诲姩id
+ * @param userId 鐢ㄦ埗id
+ * @return
+ */
+ ActivityReportVO getActivityReport(@Param("activityId") String activityId, @Param("userId") String userId);
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/StoreMemberMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/StoreMemberMapper.java
new file mode 100644
index 0000000..23e19c2
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/StoreMemberMapper.java
@@ -0,0 +1,33 @@
+package cn.lili.modules.lmk.mapper;
+
+import cn.lili.modules.lmk.domain.entity.StoreMember;
+import cn.lili.modules.lmk.domain.query.StoreMemberQuery;
+import cn.lili.modules.lmk.domain.vo.StoreMemberVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗) Mapper 鎺ュ彛
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Mapper
+public interface StoreMemberMapper extends BaseMapper<StoreMember> {
+
+ /**
+ * id鏌ユ壘鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗)
+ * @param id
+ * @return
+ */
+ StoreMemberVO getById(String id);
+
+ /**
+ * 鍒嗛〉
+ */
+ IPage getPage(IPage page, @Param("query") StoreMemberQuery query);
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java b/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
index a2b6106..dd890a6 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
@@ -3,6 +3,7 @@
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.entity.Activity;
import cn.lili.modules.lmk.domain.form.ActivityForm;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
@@ -73,4 +74,5 @@
Result activityMembersPage(ActivityMembersQuery query);
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java b/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
index a52e75c..ca43f8e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
@@ -2,12 +2,25 @@
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
+import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import com.baomidou.mybatisplus.extension.service.IService;
public interface MyActivityService extends IService<Activity> {
public Result getMyActivityList(MyActivityQuery query);
- public Result cancelActivity(ActivityReportQuery query);
+ public Result activityCancel(String activityId);
+
+ Result activityReport(ActivityReportForm activityReportForm);
+
+ /**
+ * 鑾峰緱鎶ュ悕涓棿琛ㄥ璞℃洿鍏锋椿鍔╥d 锛岋紙鐢ㄦ埛id锛夋潵鑷猽ser涓婁笅鏂�
+ * @param activityId 娲诲姩id
+ * @return 鏈煡鍒� 杩斿洖 null
+ */
+ ActivityReportVO userReport(String activityId);
+
+ Result detailByUsr(String activityId);
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/StoreMemberService.java b/framework/src/main/java/cn/lili/modules/lmk/service/StoreMemberService.java
new file mode 100644
index 0000000..7eb7339
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/StoreMemberService.java
@@ -0,0 +1,67 @@
+package cn.lili.modules.lmk.service;
+
+
+import cn.lili.base.Result;
+import cn.lili.modules.lmk.domain.entity.StoreMember;
+import cn.lili.modules.lmk.domain.form.StoreMemberForm;
+import cn.lili.modules.lmk.domain.query.StoreMemberQuery;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗) 鏈嶅姟绫�
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+public interface StoreMemberService extends IService<StoreMember> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(StoreMemberForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(StoreMemberForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(StoreMemberQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 779ff38..5999d78 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -3,22 +3,22 @@
import cn.lili.base.Result;
import cn.lili.common.enums.ActivityStatusEnum;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
-import cn.lili.modules.lmk.domain.entity.CustomerTagRef;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
import cn.lili.modules.lmk.domain.form.ActivityForm;
-import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
+import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
-import cn.lili.modules.lmk.domain.vo.CustomerBlackVO;
import cn.lili.modules.lmk.mapper.ActivityMapper;
-import cn.lili.modules.lmk.mapper.CustomerBlackMapper;
+import cn.lili.modules.lmk.mapper.ActivityReportMapper;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.LmkFileService;
+import cn.lili.modules.lmk.service.MyActivityService;
import cn.lili.modules.member.entity.vo.MemberVO;
-import cn.lili.modules.member.service.MemberService;
import cn.lili.utils.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.micrometer.core.instrument.util.StringUtils;
import lombok.RequiredArgsConstructor;
@@ -34,10 +34,11 @@
@RequiredArgsConstructor
public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {
- private final ActivityMapper activityMapper;
-
private final LmkFileService lmkFileService;
+ private final MyActivityService activityService;
+
+ private final ActivityReportMapper activityReportMapper;
@Override
public Result add(ActivityForm form) {
@@ -72,10 +73,6 @@
return Result.ok("淇敼鎴愬姛");
}
- public void updateByList(List<Activity> vo){
-
- }
-
@Override
public Result remove(List<String> ids) {
baseMapper.deleteBatchIds(ids);
@@ -84,12 +81,19 @@
@Override
public Result removeById(String id) {
+ //TODO 鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
+ //鏈夌殑璇濅笉鍙垹闄� 鑱斾腑闂磋〃鏌ヨ
+
+
+
+
//鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
ActivityVO vo = baseMapper.getById(id);
if (StringUtils.isNotEmpty(vo.getCover())){
lmkFileService.deleteObject(vo.getCover());
}
baseMapper.deleteById(id);
+
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -114,13 +118,15 @@
return Result.ok().data(vo);
}
+
@Override
public Result all() {
List<Activity> entities = baseMapper.selectList(null);
List<ActivityVO> vos = entities.stream()
.map(entity -> ActivityVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok().data(vos);
+ List<ActivityVO> reportActivityVo =vos.stream().filter(item -> ActivityStatusEnum.REPORT.getType().equals(item.getStatus())).collect(Collectors.toList());
+ return Result.ok().data(reportActivityVo);
}
@Override
@@ -160,4 +166,6 @@
baseMapper.getMembers(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
+
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
index 8193824..ca098d0 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
@@ -1,18 +1,26 @@
package cn.lili.modules.lmk.service.impl;
import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.utils.StringUtils;
import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
import cn.lili.modules.lmk.domain.vo.MyActivityVo;
import cn.lili.modules.lmk.mapper.ActivityMapper;
-import cn.lili.modules.lmk.service.LmkFileService;
+import cn.lili.modules.lmk.mapper.ActivityReportMapper;
import cn.lili.modules.lmk.service.MyActivityService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xkzhangsan.time.utils.StringUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
import java.util.Date;
import java.util.List;
@@ -21,44 +29,108 @@
@RequiredArgsConstructor
public class MyActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements MyActivityService {
private final ActivityMapper activityMapper;
- private final LmkFileService lmkFileService;
+
+ private final ActivityReportMapper activityReportMapper;
+
@Override
public Result getMyActivityList(MyActivityQuery query) {
- List<MyActivityVo> myActivityList = activityMapper.getMyActivityList(query);
+ String userId = UserContext.getCurrentUserId();
+ List<MyActivityVo> myActivityList = activityMapper.getMyActivityList(query,userId);
- for (MyActivityVo vo : myActivityList) {
- System.out.println(vo);
- if (!"鏂囧瓧".equals(vo.getCoverType())){
-// String url = lmkFileService.getPreviewUrl(vo.getCover());
-// vo.setUrl(url);
- }
- }
return Result.ok().data(myActivityList);
}
@Override
- public Result cancelActivity(ActivityReportQuery query) {
+ public Result activityCancel(String activityId) {
// TODO 鍒ゆ柇鏄惁鍦ㄦ姤鍚嶆椂闂村唴 鍦ㄧ殑璇濆彲浠ュ彇娑堟姤鍚嶏紝 锛堣嫢鏈夋姤鍚嶈垂闇�瑕侀��娆撅級
- ActivityReportVO vo = activityMapper.getActivityReport(query);
+ //鑾峰緱涓棿琛ㄤ俊鎭�
+ ActivityReportVO vo = userReport(activityId);
- Activity activity = activityMapper.selectById(vo.getActivityId());
+ Activity activity = activityMapper.selectById(activityId);
Date date = new Date();
if(!date.before(activity.getReportStartTime()) && !date.after(activity.getReportEndTime())){
- int affectedRows = activityMapper.cancelActivity(vo.getId());
- if (affectedRows > 0) {
+ boolean rowsAffected = new LambdaUpdateChainWrapper<ActivityReport>(activityReportMapper)
+ .eq(ActivityReport::getId, vo.getId()) // WHERE id = ?
+ .set(ActivityReport::getCancel, true) // SET cancel = true
+ .update(); // 鎵ц鏇存柊
+
+
+ if (rowsAffected) {
return Result.ok("娲诲姩鍙栨秷鎴愬姛");
} else {
// 鍙�夛細璁板綍璀﹀憡鏃ュ織
- throw new RuntimeException("娲诲姩涓嶅瓨鍦ㄦ垨宸插彇娑�");
+ return Result.error("娲诲姩涓嶅瓨鍦ㄦ垨宸插彇娑�");
}
}else {
- throw new RuntimeException("娲诲姩宸蹭笉鍦ㄦ姤鍚嶆椂闂村唴鏃犳硶鍙栨秷");
+ return Result.error("娲诲姩宸蹭笉鍦ㄦ姤鍚嶆椂闂村唴鏃犳硶鍙栨秷");
}
-
-
-
}
+
+ @Override
+ public Result activityReport(ActivityReportForm reportActivityForm) {
+ //鍒ゆ柇鐢ㄦ埛鏄惁宸茬粡鎶ュ悕璇ユ椿鍔�
+ ActivityReportVO reportVO = userReport(reportActivityForm.getActivityId());
+ if (reportVO != null) {
+ //鍒ゆ柇鏄惁宸插彇娑堣繃璇ユ椿鍔�
+ if (reportVO.getCancel()){
+ //閲嶆柊鎶ュ悕
+
+ ActivityReport entity = ActivityReportForm.getEntityByForm(reportActivityForm, null);
+ entity.setId(reportVO.getId());
+ entity.setUserId(UserContext.getCurrentUserId());
+ entity.setCancel(false);
+ activityReportMapper.updateById(entity);
+ return Result.ok("鎴愬姛");
+ }else {
+ return Result.error("璇ユ椿鍔ㄥ凡鎶ュ悕");
+ }
+
+
+ }
+ ActivityReport entity = ActivityReportForm.getEntityByForm(reportActivityForm, null);
+ entity.setUserId(UserContext.getCurrentUserId());
+ activityReportMapper.insert(entity);
+ return Result.ok("鎴愬姛");
+ }
+
+ /**
+ * 鑾峰緱涓棿琛ㄤ俊鎭�氳繃activityId锛寀serId
+ * @param activityId 娲诲姩id
+ * @return
+ */
+ @Override
+ public ActivityReportVO userReport(String activityId){
+
+ if (UserContext.getCurrentUserId() == null || UserContext.getCurrentUserId().isEmpty()){
+ throw new RuntimeException("鐢ㄦ埛鐧诲綍鐘舵�佸紓甯�");
+ }
+ return activityReportMapper.getActivityReport(activityId,UserContext.getCurrentUserId());
+ }
+
+ @Override
+ public Result detailByUsr(String activityId) {
+ ActivityVO vo = baseMapper.getById(activityId);
+ Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+
+ ActivityReportVO reportVO = userReport(activityId);
+ //鍒欏綋鍓嶇敤鎴锋湭鎶ュ悕
+ if (reportVO == null){
+ vo.setIsReport(false);
+ }else {
+ //宸插彇娑堝垯鍙互鎶ュ悕
+ if (reportVO.getCancel()){
+ vo.setIsReport(false);
+ }else {
+ vo.setIsReport(true);
+ }
+
+ }
+ return Result.ok().data(vo);
+ }
+
+
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java
new file mode 100644
index 0000000..bc19a15
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java
@@ -0,0 +1,169 @@
+package cn.lili.modules.lmk.service.impl;
+
+import cn.lili.base.Result;
+
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.modules.lmk.domain.entity.StoreMember;
+import cn.lili.modules.lmk.domain.form.StoreMemberForm;
+import cn.lili.modules.lmk.domain.query.StoreMemberQuery;
+import cn.lili.modules.lmk.domain.vo.StoreMemberVO;
+import cn.lili.modules.lmk.mapper.StoreMemberMapper;
+import cn.lili.modules.lmk.service.StoreMemberService;
+import cn.lili.modules.member.entity.dos.Member;
+import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
+import cn.lili.modules.member.entity.dto.MemberAddDTO;
+import cn.lili.modules.member.service.MemberService;
+import cn.lili.utils.PageUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊(鍟嗗) 鏈嶅姟瀹炵幇绫�
+ *
+ * @author zxl
+ * @since 2025-05-30
+ */
+@Service
+@RequiredArgsConstructor
+public class StoreMemberServiceImpl extends ServiceImpl<StoreMemberMapper, StoreMember> implements StoreMemberService {
+
+ private final StoreMemberMapper storeMemberMapper;
+
+ private final MemberService memberService;
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(StoreMemberForm form) {
+ //鎻掑叆鍒扮敤鎴疯〃涓�
+ AuthUser currentUser = UserContext.getCurrentUser();
+ String id = currentUser.getId();
+// String storeId = currentUser.getStoreId();
+ String storeId = "12312323123";
+ if (id == null || storeId == null) {
+ return Result.error("褰撳墠鐧诲綍璐︽埛鏈粦瀹氬晢鎴锋垨鐢ㄦ埛id鑾峰彇寮傚父");
+ }
+
+ //鎻掑叆浼氬憳琛�
+ MemberAddDTO addDTO = new MemberAddDTO();
+ addDTO.setMobile(form.getMobile());
+ addDTO.setPassword(form.getPassword());
+ addDTO.setUsername(form.getMobile());
+
+ Member member = memberService.addMember(addDTO);
+
+ //鎻掑叆鐢ㄦ埛鏉冮檺琛�
+ //id鎻掑叆闂
+ StoreMember entity = StoreMemberForm.getEntityByForm(form, null);
+ entity.setMemberId(member.getId());
+ entity.setStoreId(storeId);
+
+ baseMapper.insert(entity);
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(StoreMemberForm form) {
+ StoreMember entity = baseMapper.selectById(form.getId());
+
+ //TODO 鏄惁闇�瑕佸垽鏂瘑鐮佹柊瀵嗙爜
+ //浼氬憳淇敼瀵嗙爜锛岀數璇�
+ memberService.updateMemberPartProperties(entity.getMemberId(),form.getPassword(),form.getMobile());
+
+ //淇敼鐪熷疄濮撳悕
+ entity.setRealName(form.getRealName());
+ entity.setRole(form.getRole());
+ baseMapper.updateById(entity);
+ return Result.ok("淇敼鎴愬姛");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ baseMapper.deleteBatchIds(ids);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ StoreMember entity = baseMapper.selectById(id);
+ memberService.removeById(entity.getMemberId());
+ baseMapper.deleteById(id);
+ //鍚屾椂鍒犻櫎鐢ㄦ埛
+
+
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(StoreMemberQuery query) {
+ AuthUser currentUser = UserContext.getCurrentUser();
+// String storeId = currentUser.getStoreId();
+ String storeId = "12312323123";
+ if (storeId == null) {
+ return Result.error("褰撳墠鐧诲綍璐︽埛鏈粦瀹氬晢鎴锋垨鐢ㄦ埛id鑾峰彇寮傚父");
+ }
+ IPage<StoreMemberVO> page = PageUtil.getPage(query, StoreMemberVO.class);
+ query.setStoreId(storeId);
+ baseMapper.getPage(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+ StoreMemberVO vo = baseMapper.getById(id);
+ //瀵嗙爜鏄惁闇�瑕佽В瀵�
+
+ Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<StoreMember> entities = baseMapper.selectList(null);
+ List<StoreMemberVO> vos = entities.stream()
+ .map(entity -> StoreMemberVO.getVoByEntity(entity, null))
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index 79c9d4e..614446c 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -27,6 +27,15 @@
*/
public interface MemberService extends IService<Member> {
/**
+ * 鐢ㄦ埛鏉冮檺绠＄悊淇敼鐢ㄦ埛
+ * @param id 浼氬憳id
+ * @param password 瀵嗙爜
+ * @param mobile 鐢佃瘽锛堣处鍙凤級
+ * @return
+ */
+ Member updateMemberPartProperties(String id,String password,String mobile);
+
+ /**
* 榛樿瀵嗙爜
*/
static String DEFAULT_PASSWORD = "111111";
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index ddcd129..3cfd13a 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -502,6 +502,21 @@
return member;
}
+
+ @Override
+ public Member updateMemberPartProperties(String id,String password,String mobile) {
+ //鏌ヨ浼氬憳淇℃伅
+ Member member = this.getById(id);
+ //濡傛灉瀵嗙爜涓嶄负绌哄垯鍔犲瘑瀵嗙爜
+ if (CharSequenceUtil.isNotBlank(password)) {
+ member.setPassword(new BCryptPasswordEncoder().encode(password));
+ }
+ member.setMobile(mobile);
+ member.setUsername(mobile);
+ this.updateById(member);
+ return member;
+ }
+
@Override
public IPage<MemberVO> getMemberPage(MemberSearchVO memberSearchVO, PageVO page) {
QueryWrapper<Member> queryWrapper = Wrappers.query();
diff --git a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
index 0362cd4..4b05374 100644
--- a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
@@ -32,10 +32,6 @@
<result column="activity_report_id" property="activityReportId"/>
</resultMap>
- <resultMap id="ActivityReportMap" type="cn.lili.modules.lmk.domain.vo.ActivityReportVO">
- <result column="activity_id" property="activityId"/>
- <result column="user_id" property="userId"/>
- </resultMap>
<select id="getMyActivityList" resultMap="MyActivityResultMap">
@@ -55,7 +51,7 @@
LEFT JOIN lmk_activity LA ON LAR.activity_id = LA.id
where LA.delete_flag = 0
AND LAR.delete_flag = 0
- AND LAR.user_id = #{query.id}
+ AND LAR.user_id = #{userId}
AND LAR.cancel = #{query.cancel}
<if test="query.status == null or query.status == ''">
AND LA.status != '宸茬粨鏉�'
@@ -148,19 +144,6 @@
WHERE LAR.activity_id = #{query.id}
</select>
-
- <update id="cancelActivity" >
- UPDATE
- lmk_activity_report LAR
- SET LAR.cancel = true where LAR.id = #{id}
- </update>
-
-
- <select id="getActivityReport" resultMap="ActivityReportMap">
- SELECT LAR.* FROM lmk_activity_report LAR
- WHERE LAR.user_id = #{query.userId} and LAR.activity_id = #{query.activityId}
- </select>
-
<update id="batchUpdateActivities">
UPDATE lmk_activity
<trim prefix="SET" suffixOverrides=",">
@@ -175,4 +158,5 @@
#{item.id}
</foreach>
</update>
+
</mapper>
diff --git a/framework/src/main/resources/mapper/lmk/ActivityReportMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityReportMapper.xml
new file mode 100644
index 0000000..f7662d2
--- /dev/null
+++ b/framework/src/main/resources/mapper/lmk/ActivityReportMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.lili.modules.lmk.mapper.ActivityReportMapper">
+
+ <resultMap id="ActivityReportMap" type="cn.lili.modules.lmk.domain.vo.ActivityReportVO">
+ <result column="activity_id" property="activityId"/>
+ <result column="user_id" property="userId"/>
+ </resultMap>
+
+ <update id="cancelActivity" >
+ UPDATE
+ lmk_activity_report LAR
+ SET LAR.cancel = true where LAR.id = #{id}
+ </update>
+
+
+ <select id="getActivityReport" resultType="cn.lili.modules.lmk.domain.vo.ActivityReportVO">
+ SELECT LAR.* FROM lmk_activity_report LAR
+ WHERE LAR.user_id = #{userId} and LAR.activity_id = #{activityId}
+ AND LAR.delete_flag = 0
+ </select>
+
+</mapper>
diff --git a/framework/src/main/resources/mapper/lmk/StoreMemberMapper.xml b/framework/src/main/resources/mapper/lmk/StoreMemberMapper.xml
new file mode 100644
index 0000000..e40eeb7
--- /dev/null
+++ b/framework/src/main/resources/mapper/lmk/StoreMemberMapper.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.lili.modules.lmk.mapper.StoreMemberMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="cn.lili.modules.lmk.domain.vo.StoreMemberVO">
+ <result column="real_name" property="realName" />
+ <result column="mobile" property="mobile" />
+ <result column="password" property="password" />
+ <result column="role" property="role" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="delete_flag" property="deleteFlag" />
+
+ <result column="store_id" property="storeId" />
+ <result column="member_id" property="memberId" />
+ <result column="username" property="userName" />
+ </resultMap>
+
+
+ <select id="getById" resultMap="BaseResultMap">
+ SELECT
+ LSM.id,
+ LSM.real_name,
+ LSM.role,
+ LSM.store_id,
+ LSM.member_id,
+ LM.mobile,
+ LM.username
+ FROM lmk_store_member LSM
+ LEFT JOIN li_member LM
+ ON LM.id = LSM.member_id
+ where LSM.delete_flag = 0
+ AND LM.delete_flag = 0
+ AND LSM.id = #{id}
+ </select>
+
+
+ <select id="getPage" resultMap="BaseResultMap">
+ SELECT
+ LSM.id,
+ LSM.real_name,
+ LSM.role,
+ LSM.store_id,
+ LSM.member_id,
+ LM.mobile,
+ LM.username
+ FROM lmk_store_member LSM
+ LEFT JOIN li_member LM
+ ON LM.id = LSM.member_id
+ where LSM.delete_flag = 0
+ AND LM.delete_flag = 0
+ <if test="query.realName != null and query.realName != ''">
+ AND LSM.real_name LIKE CONCAT('%', #{query.realName}, '%')
+ </if>
+ AND LSM.store_id = #{query.storeId}
+ </select>
+
+</mapper>
diff --git a/lmk-job/src/main/java/cn/lili/job/ActivityJob.java b/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
index 40f0268..7d88ea0 100644
--- a/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
+++ b/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
@@ -43,16 +43,17 @@
.list();
Date now = new Date(); // 鑾峰彇褰撳墠鏃堕棿
-
-
for (Activity activity : activeActivities) {
if (isInProgress(now, activity)) {
activity.setStatus(ActivityStatusEnum.IN_PROGRESS.getType());
} else if (isRecruiting(now, activity)) {
activity.setStatus(ActivityStatusEnum.REPORT.getType());
- } else if (now.before(activity.getReportStartTime())) {
+ } else if (now.before(activity.getReportStartTime())) { //鍦ㄦ姤鍚嶆椂闂翠箣鍓�
activity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
- } else {
+ }else if(now.after(activity.getReportEndTime()) && now.before(activity.getStartTime())){ //鍙兘鍑虹幇 鍦ㄦ姤鍚嶇粨鏉熸椂闂村悗锛� 娲诲姩寮�濮嬩箣鍓嶇殑鎯呭喌
+ activity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
+ }
+ else {
activity.setStatus(ActivityStatusEnum.ENDED.getType());
}
}
@@ -62,11 +63,12 @@
XxlJobHelper.log("鎵ц瀹屾垚锛氭椿鍔ㄧ姸鎬佹敼鍙�");
}
-
+ //娲诲姩寮�濮嬫椂闂翠箣鍚庯紝缁撴潫鏃堕棿涔嬪墠 鍦ㄦ椿鍔ㄦ湡闂�
private boolean isInProgress(Date now, Activity activity) {
+
return !now.before(activity.getStartTime()) && !now.after(activity.getEndTime());
}
-
+ //鍦ㄦ姤鍚嶆湡闂�
private boolean isRecruiting(Date now, Activity activity) {
return !now.before(activity.getReportStartTime()) && !now.after(activity.getReportEndTime());
}
--
Gitblit v1.8.0