From fab844ecb6ff7c55a625b54e5481e0a2ab13abff Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 01 六月 2023 18:11:52 +0800
Subject: [PATCH] 商户管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtMemberTaskPageDto.java | 9
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java | 48 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java | 13
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtAgencyTaskRecordPageVo.java | 60 +++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskRecordMapper.xml | 21 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 84 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java | 7
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskRecordMapper.java | 29 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsPageDto.java | 23 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java | 28 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 7
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 69 +++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java | 7
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 7
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/AgencyTaskRecordMapper.java | 9
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java | 89 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java | 11
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java | 82 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopTaskPageDto.java | 20 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 24
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 7
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskRecordMapper.java | 3
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 15
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java | 11
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java | 14
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java | 7
/dev/null | 75 ---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 21
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTaskRecord.java | 81 ++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 5
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTaskRecord.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java | 60 +++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtGoodsPageVo.java | 11
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java | 3
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/TaskFile.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java | 44 ++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml | 18
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java | 53 ++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java | 1
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 23
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java | 14
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java | 3
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml | 40 +
48 files changed, 1,020 insertions(+), 169 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 571b7e2..b4eacc3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -33,6 +33,10 @@
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+ public static void main(String[] args) {
+ System.out.println(getNowDate());
+ }
+
/**
* 获取当前Date型日期
*
@@ -139,7 +143,7 @@
/**
* 计算时间差
*
- * @param endTime 最后时间
+ * @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差（天/小时/分钟）
*/
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index fe384b5..08f4727 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -3,15 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.goods.domain.dto.AppConsumerPageDto;
import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
import com.ruoyi.goods.domain.dto.MerShopGoodsEditDto;
-import com.ruoyi.goods.domain.vo.AppConsumerPageVo;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.service.goods.GoodsService;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
new file mode 100644
index 0000000..e039da1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
@@ -0,0 +1,48 @@
+package com.ruoyi.goods.controller.management;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
+import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
+import com.ruoyi.goods.service.goods.GoodsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MgtGoodsController
+ * @description: TODO
+ * @date 2023年06月01日
+ * @version: 1.0
+ */
+@Api(value = "平台端商品相关接口", tags = "平台端商品相关接口", description = "平台端商品相关接口")
+@RestController
+@RequestMapping("/mgt/goods")
+public class MgtGoodsController {
+
+ @Resource
+ private GoodsService goodsService;
+
+ /*@RequestMapping(value = "/pageMgtGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商品列表")
+ public R<Page<MerGoodsPageVo>> pageMgtGoods(@RequestBody MerGoodsPageDto merGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Page<MerGoodsPageVo> page = new Page<>();
+ page.setSize(merGoodsPageDto.getPageSize());
+ page.setCurrent(merGoodsPageDto.getPageNum());
+ page.setOptimizeCountSql(false);
+ List<MerGoodsPageVo> merGoodsPageVoList = goodsService.pageMgtGoods(page,merGoodsPageDto);
+ return R.ok(page.setRecords(merGoodsPageVoList));
+ }*/
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java
deleted file mode 100644
index aa03a9b..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname AppBuyNowDto
- * @description: TODO
- * @date 2023 2023/5/2 20:52
- */
-
-@Data
-public class AppBuyGoodsDto extends AppBaseDto {
-
-
- @ApiModelProperty(value = "商品id")
- private String goodsId;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-
- @ApiModelProperty(value = "用户优惠券id")
- private Long memberCouponId;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java
deleted file mode 100644
index ba2eb83..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppConsumerPageDto
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppConsumerPageDto extends AppPageDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty("商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java
deleted file mode 100644
index 84e99bd..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname AppShoppingcartDto
- * @description: TODO
- * @date 2023 2023/5/2 20:54
- */
-@Data
-public class AppPlaceOrderDto extends AppBaseDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "支付方式1.全款2.订金")
- private Integer payType;
-
- @ApiModelProperty(value = "订单备注")
- private String orderRemark;
-
- @ApiModelProperty(value = "购物车列表")
- List<AppBuyGoodsDto> appBuyGoodsDtoList;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java
deleted file mode 100644
index 096ac4a..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname AppShoppingcartDto
- * @description: TODO
- * @date 2023 2023/5/2 20:54
- */
-@Data
-public class AppSureOrderDto extends AppBaseDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "购物车列表")
- List<AppBuyGoodsDto> appBuyGoodsDtoList;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java
deleted file mode 100644
index c6ae9fa..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserOrderPageDto
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppUserOrderPageDto extends AppPageDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java
deleted file mode 100644
index 2acdd09..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MerCloseOrderDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerCloseOrderDto extends MerBaseDto {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty(value = "支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty(value = "支付备注")
- private String payRemark;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java
deleted file mode 100644
index 46b7115..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerConsumerGoodsDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerConsumerGoodsDto extends MerBaseDto {
-
- @ApiModelProperty(value = "会员用户id")
- private Long memberUserId;
-
- @ApiModelProperty("商品类型1周期2服务3体验")
- private Integer goodsType;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java
deleted file mode 100644
index 5e46932..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerConsumerGoodsDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerConsumerGoodsPageDto extends MerPageDto {
-
- @ApiModelProperty(value = "会员用户id")
- private Long memberUserId;
-
- @ApiModelProperty("商品类型1周期2服务3体验")
- private Integer goodsType;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java
index 29e1711..096a4e1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java
@@ -20,4 +20,11 @@
@ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
private Integer goodsType;
+
+ @ApiModelProperty(value = "商品分类id")
+ private Long goodsClassId;
+
+ @ApiModelProperty(value = "创建时间")
+ private String createTime;
+
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java
deleted file mode 100644
index dbaa6cc..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerNewOrderDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerNewOrderDto extends MerBaseDto {
-
- @ApiModelProperty(value = "购买用户id")
- private Long buyUserId;
-
- @ApiModelProperty(value = "姓名")
- private String name;
-
- @ApiModelProperty(value = "手机号")
- private String mobile;
-
- @ApiModelProperty(value = "购买列表")
- private List<AppBuyGoodsDto> appBuyGoodsDtoList;
-
- @ApiModelProperty(value = "支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty(value = "支付方式")
- private Integer payType;
-
- @ApiModelProperty(value = "订单备注")
- private String orderRemark;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java
deleted file mode 100644
index 6e0d6f8..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerMemberNoClearOrderDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerOrderPageDto extends MerPageDto {
-
-
-
- @ApiModelProperty(value = "会员用户id")
- private Long memberUserId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
- @ApiModelProperty(value = "1.全部2.待核销3.已核销")
- private Integer type;
-
- @ApiModelProperty(value = "订单开始时间")
- private String startOrderDate;
-
- @ApiModelProperty(value = "订单结束时间")
- private String endOrderDate;
-
- @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
- private Integer orderFrom;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java
deleted file mode 100644
index a32eb88..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.AppPageDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppConsumerPageDto
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class MerServiceRecordPageDto extends MerPageDto {
-
-
- @ApiModelProperty("会员用户id")
- private Long memberUserId;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java
deleted file mode 100644
index 9da0d92..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerSureConsumerGoodsDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerSureConsumerGoodsDto extends MerBaseDto {
-
- @ApiModelProperty(value = "会员用户id")
- private Long memberUserId;
-
- @ApiModelProperty(value = "确认服务列表")
- private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java
deleted file mode 100644
index abb75ee..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerSureConsumerGoodsListDto
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerSureConsumerGoodsListDto {
-
-
- @ApiModelProperty(value = "服务id")
- private String consumerGoodsId;
-
- @ApiModelProperty(value = "服务次数")
- private Integer serviceNum;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java
deleted file mode 100644
index 3572219..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyCodeDto
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyCodeDto extends MerBaseDto {
-
- @ApiModelProperty(value = "核销码")
- private String verifyCode;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java
deleted file mode 100644
index fe78d28..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.goods.domain.dto;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyCodeDto
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyOrderDto extends MerBaseDto {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty(value = "实收金额")
- private BigDecimal relReceiveMoney;
-
- @ApiModelProperty(value = "实收金额")
- private BigDecimal relPayMoney;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsPageDto.java
new file mode 100644
index 0000000..919fdf8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsPageDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerGoodsPageDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MgtGoodsPageDto extends MgtPageDto {
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java
deleted file mode 100644
index 027fd23..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppConsumerPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppConsumerPageVo {
-
- @ApiModelProperty("服务id")
- private String consumerGoodsId;
-
- @ApiModelProperty("服务状态-1删除1未完成2完成")
- private Integer serviceStatus;
-
- @ApiModelProperty("商户id")
- private Long shopId;
-
- @ApiModelProperty("商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty("商品名称")
- private String goodsName;
-
- @ApiModelProperty("商品图片")
- private String goodsPicture;
-
- @ApiModelProperty("商品调理问题")
- private String goodsNurses;
-
- @ApiModelProperty("周期标记")
- private Integer cycleNumFlag;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
- @ApiModelProperty("消耗次数")
- private Integer usedNum;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java
deleted file mode 100644
index c4d3f60..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppResettlement
- * @description: TODO
- * @date 2023年02月27日
- * @version: 1.0
- */
-@Data
-public class AppPlaceOrderVo {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty(value = "订单编号")
- private String orderNo;
-
- @ApiModelProperty(value = "支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty(value = "未支付金额")
- private BigDecimal unpaidMoney;
-
- @ApiModelProperty(value = "支付截止时间")
- private String payDeadlineTime;
-
- @ApiModelProperty(value = "appId")
- private String appId;
-
- @ApiModelProperty(value = "商户号")
- private String mchId;
-
- @ApiModelProperty(value = "时间戳")
- private String timeStamp;
-
- @ApiModelProperty(value = "随机串防重发")
- private String nonceStr;
-
- @ApiModelProperty(value = "package")
- @JsonProperty("package")
- private String packageStr;
-
- @ApiModelProperty(value = "签名方式")
- private String tradeType;
-
- @ApiModelProperty(value = "签名")
- private String paySign;
-
- @ApiModelProperty(value = "预支付回话标识")
- private String prepayId;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java
deleted file mode 100644
index a39abc7..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author jqs34
- * @ClassName AppServiceRecordPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppServiceRecordPageVo {
-
-
- @ApiModelProperty("服务名称")
- private String consumerGoodsNames;
-
- @ApiModelProperty("服务类型1.周期2.服务3.体验")
- private Integer serviceType;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java
deleted file mode 100644
index d7125f7..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname AppSureOrderGoodsVo
- * @description: TODO
- * @date 2023 2023/5/2 21:07
- */
-@Data
-public class AppSureOrderGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private String goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-
- @ApiModelProperty(value = "优惠券id")
- private Long memberCouponId;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal goodsPrice;
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal goodsTotalPrice;
-
- @ApiModelProperty(value = "商品订金")
- private BigDecimal goodsDeposit;
-
- @ApiModelProperty(value = "是否计算优惠券0否1是")
- private Integer useCoupon;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty(value = "商品实际价格")
- private BigDecimal goodsRealPrice;
-
- @ApiModelProperty(value = "优惠券列表")
- private List<AppMemberCouponVo> appMemberCouponVoList;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java
deleted file mode 100644
index de40568..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname AppSureOrderVo
- * @description: TODO
- * @date 2023 2023/5/2 20:57
- */
-@Data
-public class AppSureOrderVo {
-
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal orderGoodsMoney;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty(value = "订单支付订金")
- private BigDecimal orderPayDeposit;
-
- @ApiModelProperty(value = "订单支付金额")
- private BigDecimal orderPayMoney;
-
- @ApiModelProperty(value = "订单商品列表")
- List<AppSureOrderGoodsVo> appSureOrderGoodsVoList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java
deleted file mode 100644
index 02b0152..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName AppUserOrderPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppUserOrderGetVo {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty("订单编号")
- private String orderNo;
-
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
-
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
- private Integer orderFrom;
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal orderGoodsMoney;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty("应收金额")
- private BigDecimal receivableMoney;
-
- @ApiModelProperty("应收订金")
- private BigDecimal receivableDeposit;
-
- @ApiModelProperty("订单商品列表")
- private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
-
- @ApiModelProperty("订单支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty("商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "是否绑定商户0否1是")
- private Integer sameShop;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty("支付时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date payTime;
-
- @ApiModelProperty("核销时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date useTime;
-
- @ApiModelProperty("取消时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date cancelTime;
-
- @ApiModelProperty("订单备注")
- private String orderRemark;
-
- @ApiModelProperty(value = "核销码")
- private String verifyCode;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java
deleted file mode 100644
index 0bd690a..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppUserOrderPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppUserOrderGoodsPageVo {
-
- @ApiModelProperty("订单商品id")
- private String orderGoodsId;
-
- @ApiModelProperty("商品id")
- private String goodsId;
-
- @ApiModelProperty("商品名称")
- private String goodsName;
-
- @ApiModelProperty("商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal goodsPrice;
-
- @ApiModelProperty(value = "商品实际价格")
- private BigDecimal goodsRealPrice;
-
- @ApiModelProperty("周期标记")
- private Integer cycleNumFlag;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java
deleted file mode 100644
index 32cb196..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName AppUserOrderPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class AppUserOrderPageVo {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty("订单编号")
- private String orderNo;
-
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
-
- @ApiModelProperty("订单来源1.商城订单2.秒杀活动3.线下创建")
- private Integer orderFrom;
-
- @ApiModelProperty("订单商品列表")
- private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
-
- @ApiModelProperty("订单支付金额")
- private BigDecimal receivableMoney;
-
- @ApiModelProperty("商品数量")
- private Integer goodsNum;
-
- @ApiModelProperty("商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty(value = "是否绑定商户0否1是")
- private Integer sameShop;
-
- @ApiModelProperty(value = "核销码")
- private String verifyCode;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java
deleted file mode 100644
index 36122db..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerConsumerGoodsVo
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerConsumerGoodsListVo {
-
- @ApiModelProperty("服务id")
- private String consumerGoodsId;
-
- @ApiModelProperty("服务状态-1删除1未完成2完成")
- private Integer serviceStatus;
-
- @ApiModelProperty("商户id")
- private Long shopId;
-
- @ApiModelProperty("商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty("商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty("商品图片")
- private String goodsPicture;
-
- @ApiModelProperty("商品调理问题")
- private String goodsNurses;
-
- @ApiModelProperty("周期标记")
- private Integer cycleNumFlag;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
- @ApiModelProperty("消耗次数")
- private Integer usedNum;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java
deleted file mode 100644
index 16adc3d..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerConsumerGoodsVo
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerConsumerGoodsVo {
-
- @ApiModelProperty("未确认商品")
- private List<MerConsumerGoodsListVo> noSureList;
-
- @ApiModelProperty("确认商品")
- private List<MerConsumerGoodsListVo> sureList;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java
deleted file mode 100644
index 0952b48..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerMemberUnclearOrder
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerMemberNoClearOrderVo {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty("订单编号")
- private String orderNo;
-
- @ApiModelProperty("订单状态")
- private Integer orderStatus;
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal orderGoodsMoney;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty("应收金额")
- private BigDecimal receivableMoney;
-
- @ApiModelProperty("应收订金")
- private BigDecimal receivableDeposit;
-
- @ApiModelProperty("订单实际支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty("订单未支付金额")
- private BigDecimal unPaidMoney;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java
deleted file mode 100644
index 50513ba..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerOrderGoodsVo
- * @description: TODO
- * @date 2023年05月06日
- * @version: 1.0
- */
-@Data
-public class MerOrderGoodsPageVo {
-
- @ApiModelProperty("商品名字")
- private String goodsName;
-
- @ApiModelProperty("购买数量")
- private Integer buyNum;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java
deleted file mode 100644
index ae7f145..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerMemberUnclearOrder
- * @description: TODO
- * @date 2023年05月05日
- * @version: 1.0
- */
-@Data
-public class MerOrderPageVo {
-
- @ApiModelProperty(value = "用户id")
- private Long userId;
-
- @ApiModelProperty(value = "用户姓名")
- private String userName;
-
- @ApiModelProperty(value = "用户电话")
- private String userMobile;
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty("订单编号")
- private String orderNo;
-
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal orderGoodsMoney;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty("应收金额")
- private BigDecimal receivableMoney;
-
- @ApiModelProperty("应收订金")
- private BigDecimal receivableDeposit;
-
- @ApiModelProperty("订单实际支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty("订单未支付金额")
- private BigDecimal unPaidMoney;
-
- @ApiModelProperty("订单备注")
- private String orderRemark;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty("订单来源")
- private Integer orderFrom;
-
- @ApiModelProperty("订单来源")
- private String orderFromDesc;
-
- @ApiModelProperty("订单商品列表")
- private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java
deleted file mode 100644
index 53da184..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author jqs34
- * @ClassName AppServiceRecordPageVo
- * @description: TODO
- * @date 2023年05月03日
- * @version: 1.0
- */
-@Data
-public class MerServiceRecordPageVo {
-
-
- @ApiModelProperty("服务名称")
- private String consumerGoodsNames;
-
- @ApiModelProperty("服务类型1.周期2.服务3.体验")
- private Integer serviceType;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java
deleted file mode 100644
index bb646f1..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyAwardVo
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyAwardVo {
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java
deleted file mode 100644
index a7b98e6..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyCodeDto
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyCodeVo{
-
- @ApiModelProperty(value = "核销类型1订单2优惠券3奖品")
- private Integer verifyType;
-
- @ApiModelProperty(value = "核销订单信息")
- private MerVerifyOrderVo merVerifyOrderVo;
-
- @ApiModelProperty(value = "核销优惠券信息")
- private MerVerifyCouponVo merVerifyCouponVo;
-
- @ApiModelProperty(value = "核销奖品信息")
- private MerVerifyAwardVo merVerifyAwardVo;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java
deleted file mode 100644
index c94aba6..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyCouponVo
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyCouponVo {
-
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java
deleted file mode 100644
index cff2865..0000000
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.ruoyi.goods.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerVerifyOrderVo
- * @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
- */
-@Data
-public class MerVerifyOrderVo {
-
- @ApiModelProperty(value = "订单id")
- private String orderId;
-
- @ApiModelProperty("订单编号")
- private String orderNo;
-
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
-
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
- private Integer orderFrom;
-
- @ApiModelProperty(value = "商品总价")
- private BigDecimal orderGoodsMoney;
-
- @ApiModelProperty(value = "优惠券抵扣")
- private BigDecimal couponDiscount;
-
- @ApiModelProperty("应收金额")
- private BigDecimal receivableMoney;
-
- @ApiModelProperty("应收订金")
- private BigDecimal receivableDeposit;
-
- @ApiModelProperty("订单商品列表")
- private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
-
- @ApiModelProperty("订单支付金额")
- private BigDecimal payMoney;
-
- @ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty("支付时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date payTime;
-
- @ApiModelProperty("核销时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date useTime;
-
- @ApiModelProperty("订单备注")
- private String orderRemark;
-
- @ApiModelProperty(value = "用户姓名")
- private String userName;
-
- @ApiModelProperty(value = "用户电话")
- private String userMobile;
-
- @ApiModelProperty("结清标记0否1是")
- private Integer closeFlag;
-}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtGoodsPageVo.java
new file mode 100644
index 0000000..d0bab5a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtGoodsPageVo.java
@@ -0,0 +1,11 @@
+package com.ruoyi.goods.domain.vo;
+
+/**
+ * @author jqs34
+ * @ClassName MgtGoodsPageVo
+ * @description: TODO
+ * @date 2023年06月01日
+ * @version: 1.0
+ */
+public class MgtGoodsPageVo {
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
index d4652e2..052132e 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -1,8 +1,11 @@
package com.ruoyi.goods.service.impl.goods;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
@@ -192,7 +195,7 @@
if(shopGoods!=null){
shopGoods.setSalesPrice(merShopGoodsEditDto.getSalePrice());
shopGoods.setServiceNum(merShopGoodsEditDto.getServiceNum());
- shopGoods.setUpdateTime(new Date());
+ shopGoods.setUpdateTime(DateUtils.getNowDate());
shopGoods.setUpdateUserId(merShopGoodsEditDto.getUserId());
}else{
shopGoods = new ShopGoods();
@@ -201,7 +204,7 @@
shopGoods.setGoodsId(merShopGoodsEditDto.getGoodsId());
shopGoods.setSalesPrice(merShopGoodsEditDto.getSalePrice());
shopGoods.setServiceNum(merShopGoodsEditDto.getServiceNum());
- shopGoods.setUpdateTime(new Date());
+ shopGoods.setUpdateTime(DateUtils.getNowDate());
shopGoods.setUpdateUserId(merShopGoodsEditDto.getUserId());
}
shopGoodsService.saveOrUpdate(shopGoods);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
index e8e5312..4374339 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
@@ -62,11 +63,11 @@
shoppingCart.setGoodsId(appShoppingCartAddDto.getGoodsId());
shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
shoppingCart.setDelFlag(0);
- shoppingCart.setCreateTime(new Date());
+ shoppingCart.setCreateTime(DateUtils.getNowDate());
this.save(shoppingCart);
}else{
shoppingCart.setBuyNum(shoppingCart.getBuyNum()+appShoppingCartAddDto.getBuyNum());
- shoppingCart.setUpdateTime(new Date());
+ shoppingCart.setUpdateTime(DateUtils.getNowDate());
this.saveOrUpdate(shoppingCart);
}
}
@@ -85,7 +86,7 @@
throw new ServiceException(AppErrorConstant.GOODS_DOWN);
}
shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
- shoppingCart.setUpdateTime(new Date());
+ shoppingCart.setUpdateTime(DateUtils.getNowDate());
this.saveOrUpdate(shoppingCart);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index e5a739d..141fcaa 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -242,7 +242,7 @@
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setMemberId(memberId);
member.setBindingFlag(0);
- member.setCreateTime(new Date());
+ member.setCreateTime(DateUtils.getNowDate());
member.setMobile(mobile);
initMemberTotal(memberId);
}else{
@@ -324,7 +324,7 @@
switch (editType){
case 1:
member.setNickName(editValue);
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
@@ -332,13 +332,13 @@
break;
case 3:
member.setGender(Integer.valueOf(editValue));
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
case 4:
member.setBirthday(editValue);
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
member.setUpdateUserId(appEditUserDto.getUserId());
this.saveOrUpdate(member);
break;
@@ -520,7 +520,7 @@
member.setBindingFlag(1);
member.setRelationShopId(merMemberAddDto.getShopId());
member.setCustomerSource("商户添加");
- member.setCreateTime(new Date());
+ member.setCreateTime(DateUtils.getNowDate());
log.info("member-----------------"+member.toString());
this.saveOrUpdate(member);
initMemberTotal(memberId);
@@ -551,7 +551,7 @@
member.setLevel(merMemberEditDto.getLevel());
member.setBirthday(merMemberEditDto.getBirthday());
member.setUpdateUserId(merMemberEditDto.getUserId());
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
log.info("member-----------------"+member.toString());
this.saveOrUpdate(member);
SysUser sysUser = new SysUser();
@@ -614,7 +614,7 @@
member.setDelFlag(0);
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setBindingFlag(0);
- member.setCreateTime(new Date());
+ member.setCreateTime(DateUtils.getNowDate());
member.setCustomerSource("商户订单添加");
this.saveOrUpdate(member);
initMemberTotal(member.getMemberId());
@@ -686,8 +686,8 @@
MgtActivenessJudgeVo mgtActivenessJudgeVo;
for(Activeness activeness : activenessList){
mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
- mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(),activeness.getEndDay()));
- mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(),activeness.getStartDay()-1));
+ mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getEndDay()));
+ mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getStartDay()-1));
mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
}
//活跃度赋值
@@ -723,7 +723,7 @@
member.setRelationShopId(shop.getShopId());
member.setRelationShopName(shop.getShopName());
member.setBindingFlag(1);
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
this.saveOrUpdate(member);
}
@@ -737,7 +737,7 @@
public void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto){
Member member = this.getById(mgtMemberRelDelDto.getMemberUserId());
member.setBindingFlag(0);
- member.setUpdateTime(new Date());
+ member.setUpdateTime(DateUtils.getNowDate());
member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
this.saveOrUpdate(member);
}
@@ -802,7 +802,7 @@
integralRecord.setChangeIntegral( 0-integer);
}
integralRecord.setSurpIntegral(useableIntegral);
- integralRecord.setCreateTime(new Date());
+ integralRecord.setCreateTime(DateUtils.getNowDate());
integralRecord.setOrderId(memberIntegralChangeDto.getOrderId());
integralRecord.setOrderNo(memberIntegralChangeDto.getOrderNo());
switch (recordType){
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
index 612a3bc..2b30b48 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.member.domain.pojo.member.MemberSuggest;
import com.ruoyi.member.domain.vo.AppSuggestPageVo;
import com.ruoyi.member.mapper.member.MemberSuggestMapper;
@@ -50,7 +51,7 @@
memberSuggest.setDelFlag(0);
memberSuggest.setCreateUserId(appUserSuggestDto.getUserId());
memberSuggest.setSuggestContent(appUserSuggestDto.getSuggestContent());
- memberSuggest.setCreateTime(new Date());
+ memberSuggest.setCreateTime(DateUtils.getNowDate());
memberSuggest.setSuggestType(appUserSuggestDto.getSuggestType());
this.saveOrUpdate(memberSuggest);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index 003aa9c..db79d33 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
@@ -111,10 +112,10 @@
throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
}
consumerGoods.setUsedNum(usedNum+useNum);
- consumerGoods.setUseTime(new Date());
+ consumerGoods.setUseTime(DateUtils.getNowDate());
if(consumerGoods.getUsedNum().equals(serviceNum)){
consumerGoods.setServiceStatus(2);
- consumerGoods.setCompleteTime(new Date());
+ consumerGoods.setCompleteTime(DateUtils.getNowDate());
}
this.saveOrUpdate(consumerGoods);
shopId = consumerGoods.getShopId();
@@ -132,7 +133,7 @@
}
}
UserServiceRecord userServiceRecord = new UserServiceRecord();
- userServiceRecord.setCreateTime(new Date());
+ userServiceRecord.setCreateTime(DateUtils.getNowDate());
userServiceRecord.setServiceType(serviceType);
userServiceRecord.setDelFlag(0);
userServiceRecord.setShopId(shopId);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index b21a0dd..0f21cd9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.core.utils.uuid.UUID;
@@ -372,7 +373,7 @@
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
- order.setCreateTime(new Date());
+ order.setCreateTime(DateUtils.getNowDate());
this.save(order);
//更新用户商品类型
if(goodsTypeSet!=null&&goodsTypeSet.size()>0){
@@ -473,7 +474,7 @@
throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
}
order.setOrderStatus(0);
- order.setCancelTime(new Date());
+ order.setCancelTime(DateUtils.getNowDate());
this.saveOrUpdate(order);
}
@@ -558,7 +559,7 @@
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
- Date nowTime = new Date();
+ Date nowTime = DateUtils.getNowDate();
//更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(3);
@@ -814,9 +815,9 @@
}
order.setOrderRemark(merNewOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
- order.setCreateTime(new Date());
- order.setPayTime(new Date());
- order.setUseTime(new Date());
+ order.setCreateTime(DateUtils.getNowDate());
+ order.setPayTime(DateUtils.getNowDate());
+ order.setUseTime(DateUtils.getNowDate());
order.setUseUserId(merNewOrderDto.getUserId());
order.setPayMoney(merNewOrderDto.getPayMoney());
order.setOnlinePayMoney(new BigDecimal("0.00"));
@@ -843,7 +844,7 @@
consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
consumerGoods.setUsedNum(0);
consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
- consumerGoods.setCreateTime(new Date());
+ consumerGoods.setCreateTime(DateUtils.getNowDate());
consumerGoodsService.save(consumerGoods);
}
Member member = remoteMemberService.getMember(userId).getData();
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
index 247bb5b..300b143 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
@@ -35,13 +36,13 @@
@RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)
@ApiOperation(value = "平台获取用户跟进列表")
- public R<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtPageDto mgtPageDto) {
+ public R<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
Long userId = SecurityUtils.getUserId();
- mgtPageDto.setUserId(userId);
+ mgtMemberTaskPageDto.setUserId(userId);
Page<MgtMemberFollowPageVo> page = new Page<>();
- page.setSize(mgtPageDto.getPageSize());
- page.setCurrent(mgtPageDto.getPageNum());
- List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page);
+ page.setSize(mgtMemberTaskPageDto.getPageSize());
+ page.setCurrent(mgtMemberTaskPageDto.getPageNum());
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
return R.ok(page.setRecords(mgtMemberFollowPageVoList));
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
new file mode 100644
index 0000000..ab4a81d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java
@@ -0,0 +1,82 @@
+package com.ruoyi.shop.controller.management;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.shop.domain.dto.MerFollowMemberTaskDto;
+import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
+import com.ruoyi.shop.domain.vo.MgtShopTagVo;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import com.ruoyi.shop.service.task.AgencyTaskRecordService;
+import com.ruoyi.shop.service.task.ShopTaskRecordService;
+import com.ruoyi.shop.service.task.ShopTaskService;
+import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MgtTaskController
+ * @description: TODO
+ * @date 2023年06月01日
+ * @version: 1.0
+ */
+@Api(value = "管理台任务相关接口", tags = "管理台任务相关接口", description = "管理台任务相关接口")
+@RestController
+@RequestMapping("/mgt/task")
+public class MgtTaskController {
+
+ @Autowired
+ private ShopTaskService shopTaskService;
+
+ @Autowired
+ private AgencyTaskRecordService agencyTaskRecordService;
+
+ @Autowired
+ private ShopTaskRecordService shopTaskRecordService;
+
+ @RequestMapping(value = "/followShopTask", method = RequestMethod.POST)
+ @ApiOperation(value = "商户跟进")
+ public R followShopTask(@RequestBody MgtFollowShopTaskDto mgtFollowShopTaskDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtFollowShopTaskDto.setUserId(userId);
+ shopTaskService.followShopTask(mgtFollowShopTaskDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pageMgtShopFollow", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取平台跟进列表")
+ public R<Page<MgtShopTaskRecordPageVo>> pageMgtShopFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopTaskPageDto.setUserId(userId);
+ Page<MgtShopTaskRecordPageVo> page = new Page<>();
+ page.setSize(mgtShopTaskPageDto.getPageSize());
+ page.setCurrent(mgtShopTaskPageDto.getPageNum());
+ List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordService.pageMgtShopFollow(page,mgtShopTaskPageDto);
+ return R.ok(page.setRecords(mgtShopTaskRecordPageVoList));
+ }
+
+ @RequestMapping(value = "/pageMgtAgencyFollow", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取代理商跟进列表")
+ public R<Page<MgtAgencyTaskRecordPageVo>> pageMgtAgencyFollow(@RequestBody MgtShopTaskPageDto mgtShopTaskPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopTaskPageDto.setUserId(userId);
+ Page<MgtAgencyTaskRecordPageVo> page = new Page<>();
+ page.setSize(mgtShopTaskPageDto.getPageSize());
+ page.setCurrent(mgtShopTaskPageDto.getPageNum());
+ List<MgtAgencyTaskRecordPageVo> mgtMemberFollowPageVoList = agencyTaskRecordService.pageMgtAgencyFollow(page,mgtShopTaskPageDto);
+ return R.ok(page.setRecords(mgtMemberFollowPageVoList));
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java
new file mode 100644
index 0000000..c0573ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java
@@ -0,0 +1,44 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName MerFollowMemberTask
+ * @description: TODO
+ * @date 2023年05月06日
+ * @version: 1.0
+ */
+@Data
+public class MgtFollowShopTaskDto extends MerBaseDto {
+
+ @ApiModelProperty("商户id")
+ private Long shopId;
+
+ @ApiModelProperty("任务标题")
+ private String taskTitle;
+
+ @ApiModelProperty("跟进类型")
+ private String followType;
+
+ @ApiModelProperty("跟进内容")
+ private String followContent;
+
+ @ApiModelProperty("跟进图片地址 多个,号隔开")
+ private String picture;
+
+ @ApiModelProperty("下次任务时间")
+ private String nextTaskDate;
+
+ @ApiModelProperty("下次任务标题")
+ private String nextTaskTitle;
+
+ @ApiModelProperty("紧急程度")
+ private String emergencyState;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtMemberTaskPageDto.java
similarity index 62%
rename from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java
rename to ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtMemberTaskPageDto.java
index 4ecd1e0..1674cc4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtMemberTaskPageDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.goods.domain.dto;
+package com.ruoyi.shop.domain.dto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
@@ -6,14 +6,13 @@
/**
* @author jqs34
- * @ClassName MerMemberNoClearOrderDto
+ * @ClassName MerMemberTaskPageDto
* @description: TODO
- * @date 2023年05月05日
+ * @date 2023年05月06日
* @version: 1.0
*/
@Data
-public class MerMemberNoClearOrderDto extends MerPageDto {
-
+public class MgtMemberTaskPageDto extends MerPageDto {
@ApiModelProperty(value = "会员用户id")
private Long memberUserId;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopTaskPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopTaskPageDto.java
new file mode 100644
index 0000000..b37173e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopTaskPageDto.java
@@ -0,0 +1,20 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MgtShopTaskPagedto
+ * @description: TODO
+ * @date 2023年06月01日
+ * @version: 1.0
+ */
+@Data
+public class MgtShopTaskPageDto extends MgtPageDto {
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
index 53e1ec2..f55cd1b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
@@ -70,6 +70,12 @@
@TableField("call_phone")
private String callPhone;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+
@Override
protected Serializable pkVal() {
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTaskRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTaskRecord.java
index 709d20a..2354b46 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTaskRecord.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/MemberTaskRecord.java
@@ -67,6 +67,12 @@
@TableField("call_phone")
private String callPhone;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
index ed9f855..405659b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTask.java
@@ -40,10 +40,10 @@
@TableField("shop_id")
private Long shopId;
/**
- * 跟进类型id
+ * 跟进类型
*/
- @TableField("follow_type_id")
- private Long followTypeId;
+ @TableField("follow_type")
+ private String followType;
/**
* 跟进内容
*/
@@ -53,17 +53,17 @@
* 下次跟进时间
*/
@TableField("next_follow_date")
- private Date nextFollowDate;
+ private String nextFollowDate;
/**
* 任务标题
*/
@TableField("task_title")
private String taskTitle;
/**
- * 紧急情况id
+ * 紧急情况
*/
- @TableField("emergency_state_id")
- private Long emergencyStateId;
+ @TableField("emergency_state")
+ private String emergencyState;
/**
* 创建时间
*/
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTaskRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTaskRecord.java
new file mode 100644
index 0000000..317f30b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/ShopTaskRecord.java
@@ -0,0 +1,81 @@
+package com.ruoyi.shop.domain.pojo.task;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 会员跟进任务记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_shop_task_record")
+public class ShopTaskRecord extends Model<ShopTaskRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 任务id
+ */
+ @TableField("task_id")
+ private String taskId;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Long userId;
+ /**
+ * 跟踪类型1电话2手动
+ */
+ @TableField("follow_type")
+ private Integer followType;
+ /**
+ * 电话时间
+ */
+ @TableField("call_time")
+ private Date callTime;
+ /**
+ * 跟踪内容
+ */
+ @TableField("follow_content")
+ private String followContent;
+ /**
+ * 拨打电话
+ */
+ @TableField("call_phone")
+ private String callPhone;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/TaskFile.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/TaskFile.java
index 7d552c7..7699ee8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/TaskFile.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/TaskFile.java
@@ -40,7 +40,7 @@
@TableField("follow_id")
private Long followId;
/**
- * 跟进来源1商户2客户
+ * 跟进来源1商户-商户2商户-客户3平台-商户4员工-商户
*/
@TableField("follow_from")
private Integer followFrom;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java
index 92cf76b..29c1ca6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java
@@ -25,7 +25,6 @@
@ApiModelProperty(value = "回复内容")
private String replayContent;
-
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtAgencyTaskRecordPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtAgencyTaskRecordPageVo.java
new file mode 100644
index 0000000..64a0768
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtAgencyTaskRecordPageVo.java
@@ -0,0 +1,60 @@
+package com.ruoyi.shop.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberTaskRecordPageVo
+ * @description: TODO
+ * @date 2023年05月06日
+ * @version: 1.0
+ */
+@Data
+public class MgtAgencyTaskRecordPageVo {
+
+ @ApiModelProperty(value = "商户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "用户头像")
+ private String userPicture;
+
+ @ApiModelProperty(value = "跟进id")
+ private Long followId;
+
+ @ApiModelProperty(value = "任务id")
+ private String taskId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("跟踪类型1电话2手动")
+ private Integer followType;
+
+ @ApiModelProperty("电话时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date callTime;
+
+ @ApiModelProperty("跟踪内容")
+ private String followContent;
+
+ @ApiModelProperty("拨打电话")
+ private String callPhone;
+
+ @ApiModelProperty("跟进图片地址")
+ private List<String> picture;
+
+ @ApiModelProperty("跟进视频地址")
+ private List<String> video;
+
+ @ApiModelProperty("跟进音频地址")
+ private List<String> audio;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java
new file mode 100644
index 0000000..63ce6a3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java
@@ -0,0 +1,60 @@
+package com.ruoyi.shop.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberTaskRecordPageVo
+ * @description: TODO
+ * @date 2023年05月06日
+ * @version: 1.0
+ */
+@Data
+public class MgtShopTaskRecordPageVo {
+
+ @ApiModelProperty(value = "商户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "用户头像")
+ private String userPicture;
+
+ @ApiModelProperty(value = "跟进id")
+ private Long followId;
+
+ @ApiModelProperty(value = "任务id")
+ private String taskId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("跟踪类型1电话2手动")
+ private Integer followType;
+
+ @ApiModelProperty("电话时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date callTime;
+
+ @ApiModelProperty("跟踪内容")
+ private String followContent;
+
+ @ApiModelProperty("拨打电话")
+ private String callPhone;
+
+ @ApiModelProperty("跟进图片地址")
+ private List<String> picture;
+
+ @ApiModelProperty("跟进视频地址")
+ private List<String> video;
+
+ @ApiModelProperty("跟进音频地址")
+ private List<String> audio;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/AgencyTaskRecordMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/AgencyTaskRecordMapper.java
index ee77f11..9cd4cef 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/AgencyTaskRecordMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/AgencyTaskRecordMapper.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.AgencyTaskRecord;
import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -26,4 +28,11 @@
* @return
*/
List<MerAgencyTaskRecordPageVo> pageMerAgencyTaskRecord (Page page, @Param("param") MerAgencyTaskPageDto merAgencyTaskPageDto);
+
+ /**
+ * 平台分页获取代理商跟进任务
+ * @param page
+ * @return
+ */
+ List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(Page page, @Param("param")MgtShopTaskPageDto mgtShopTaskPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskRecordMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskRecordMapper.java
index 97f7586..3f6bcc2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskRecordMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskRecordMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
@@ -34,5 +35,5 @@
* @param page
* @return
*/
- List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page);
+ List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, @Param("param")MgtMemberTaskPageDto mgtMemberTaskPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
index 189eb5f..a79ab8e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskMapper.java
@@ -1,7 +1,13 @@
package com.ruoyi.shop.mapper.task;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +19,5 @@
*/
public interface ShopTaskMapper extends BaseMapper<ShopTask> {
+
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskRecordMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskRecordMapper.java
new file mode 100644
index 0000000..b1d1fbf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/ShopTaskRecordMapper.java
@@ -0,0 +1,29 @@
+package com.ruoyi.shop.mapper.task;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员跟进任务记录 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-06-01
+ */
+public interface ShopTaskRecordMapper extends BaseMapper<ShopTaskRecord> {
+
+
+ /**
+ * 平台分页获取平台跟进任务
+ * @param page
+ * @return
+ */
+ List<MgtShopTaskRecordPageVo> pageMgtShopFollow(Page page, @Param("param") MgtShopTaskPageDto mgtShopTaskPageDto);
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 5177708..8a4dc81 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
@@ -118,7 +119,7 @@
Shop shop = new Shop();
if(MGTEditShopDto.getShopId()!=null){
shop = this.getById(MGTEditShopDto.getShopId());
- shop.setUpdateTime(new Date());
+ shop.setUpdateTime(DateUtils.getNowDate());
shop.setUpdateUserId(MGTEditShopDto.getUserId());
shop.setShopTags(null);
//清空关联记录
@@ -130,7 +131,7 @@
shopStaffService.clearShopStaffRelation(shop.getShopId());
}else{
shop.setShopStatus(2);
- shop.setCreateTime(new Date());
+ shop.setCreateTime(DateUtils.getNowDate());
shop.setCreateUserId(MGTEditShopDto.getUserId());
}
BeanUtils.copyProperties(MGTEditShopDto,shop);
@@ -220,7 +221,7 @@
try {
Date coopStartDate = simpleDateFormat.parse(coopStartTime);
Date coopEndDate = simpleDateFormat.parse(coopEndTime);
- Date nowTime = new Date();
+ Date nowTime = DateUtils.getNowDate();
shop.setCooperationStartTime(coopStartDate);
shop.setCooperationEndTime(coopEndDate);
Boolean inTime = false;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
index 024979d..1b6fce0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
import com.ruoyi.shop.domain.pojo.shop.ShopSuggest;
import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
@@ -51,7 +52,7 @@
shopSuggest.setCreateUserId(merShopSuggestDto.getUserId());
shopSuggest.setShopId(merShopSuggestDto.getShopId());
shopSuggest.setSuggestContent(merShopSuggestDto.getSuggestContent());
- shopSuggest.setCreateTime(new Date());
+ shopSuggest.setCreateTime(DateUtils.getNowDate());
this.save(shopSuggest);
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
index a91505a..b9b5667 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskRecordServiceImpl.java
@@ -4,14 +4,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.AgencyTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.mapper.task.AgencyTaskRecordMapper;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.TaskFileService;
import com.ruoyi.shop.util.FileConvertUtils;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -36,6 +41,9 @@
@Resource
private TaskFileService taskFileService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
/**
*
* @param page
@@ -51,6 +59,7 @@
List<String> picture = new ArrayList<>();
List<String> video = new ArrayList<>();
List<String> audio = new ArrayList<>();
+ //获取跟进详情文件
for(MerAgencyTaskRecordPageVo merAgencyTaskRecordPageVo : merAgencyTaskRecordPageVoList){
followId = merAgencyTaskRecordPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
@@ -73,4 +82,48 @@
return merAgencyTaskRecordPageVoList;
}
+
+ /**
+ * 平台分页获取代理商跟进任务
+ * @param page
+ * @return
+ */
+ @Override
+ public List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto){
+ List<MgtAgencyTaskRecordPageVo> mgtAgencyTaskRecordPageVoList = agencyTaskRecordMapper.pageMgtAgencyFollow(page, mgtShopTaskPageDto);
+ if(mgtAgencyTaskRecordPageVoList!=null&&!mgtAgencyTaskRecordPageVoList.isEmpty()){
+ Long followId;
+ List<TaskFile> taskFileList;
+ List<String> picture = new ArrayList<>();
+ List<String> video = new ArrayList<>();
+ List<String> audio = new ArrayList<>();
+ Long userId;
+ SysUser sysUser;
+ for(MgtAgencyTaskRecordPageVo mgtAgencyTaskRecordPageVo : mgtAgencyTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = mgtAgencyTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ mgtAgencyTaskRecordPageVo.setUserName(sysUser.getNickName());
+ mgtAgencyTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = mgtAgencyTaskRecordPageVo.getFollowId();
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ mgtAgencyTaskRecordPageVo.setPicture(picture);
+ mgtAgencyTaskRecordPageVo.setVideo(video);
+ mgtAgencyTaskRecordPageVo.setAudio(audio);
+ }
+ }
+ return mgtAgencyTaskRecordPageVoList;
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index 18f1c45..f7fb90e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.shop.mapper.task.AgencyTaskMapper;
import com.ruoyi.shop.service.task.AgencyTaskRecordService;
import com.ruoyi.shop.service.task.AgencyTaskService;
+import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,6 +36,9 @@
@Resource
private AgencyTaskRecordService agencyTaskRecordService;
+
+ @Resource
+ private TaskFileService taskFileService;
/**
*
* @param page
@@ -43,7 +47,7 @@
*/
@Override
public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
- String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
+ String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",DateUtils.getNowDate());
merAgencyTaskPageDto.setNowDay(nowDay);
List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
return merAgencyTaskPageVoList;
@@ -57,7 +61,7 @@
public void createAgencyTask(MerCreateAgencyTaskDto merCreateAgencyTaskDto){
AgencyTask agencyTask = new AgencyTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
agencyTask.setTaskId(taskId);
agencyTask.setDelFlag(0);
agencyTask.setTaskStatus(0);
@@ -65,7 +69,7 @@
agencyTask.setAgencyId(merCreateAgencyTaskDto.getAgencyId());
agencyTask.setTaskDate(merCreateAgencyTaskDto.getTaskDate());
agencyTask.setTaskContent(merCreateAgencyTaskDto.getTaskContent());
- agencyTask.setCreateTime(new Date());
+ agencyTask.setCreateTime(DateUtils.getNowDate());
this.saveOrUpdate(agencyTask);
}
@@ -77,13 +81,17 @@
public void followAgencyTask(MerFollowAgencyTaskDto merFollowAgencyTaskDto){
AgencyTaskRecord agencyTaskRecord = new AgencyTaskRecord();
AgencyTask oldAgencyTask = this.getById(merFollowAgencyTaskDto.getTaskId());
+ //更新任务
agencyTaskRecord.setTaskId(merFollowAgencyTaskDto.getTaskId());
agencyTaskRecord.setDelFlag(0);
agencyTaskRecord.setUserId(merFollowAgencyTaskDto.getUserId());
agencyTaskRecord.setFollowType(merFollowAgencyTaskDto.getFollowType());
agencyTaskRecord.setCallPhone(merFollowAgencyTaskDto.getCallPhone());
agencyTaskRecord.setCallTime(merFollowAgencyTaskDto.getCallTime());
+ agencyTaskRecord.setFollowContent(merFollowAgencyTaskDto.getFollowContent());
+ agencyTaskRecord.setCreateTime(DateUtils.getNowDate());
agencyTaskRecordService.saveOrUpdate(agencyTaskRecord);
+ //创建任务详情文件
String picture = merFollowAgencyTaskDto.getPicture();
String video = merFollowAgencyTaskDto.getVideo();
String audio = merFollowAgencyTaskDto.getAudio();
@@ -98,6 +106,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(video)){
@@ -109,6 +118,8 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
+
}
}
if(StringUtils.isNotBlank(audio)){
@@ -120,11 +131,13 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
}
}
+ //创建新任务
if(StringUtils.isNotBlank(merFollowAgencyTaskDto.getNextTaskDate())){
AgencyTask agencyTask = new AgencyTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
agencyTask.setTaskId(taskId);
agencyTask.setDelFlag(0);
agencyTask.setShopId(oldAgencyTask.getShopId());
@@ -132,7 +145,7 @@
agencyTask.setTaskDate(merFollowAgencyTaskDto.getNextTaskDate());
agencyTask.setTaskContent(merFollowAgencyTaskDto.getNextTaskContent());
agencyTask.setTaskStatus(2);
- agencyTask.setCreateTime(new Date());
+ agencyTask.setCreateTime(DateUtils.getNowDate());
this.saveOrUpdate(agencyTask);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
index ee2bbb8..b639b88 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.shop.service.impl.task;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.ruoyi.shop.domain.pojo.task.TaskFile;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
@@ -9,17 +11,12 @@
import com.ruoyi.shop.mapper.task.MemberTaskRecordMapper;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.service.task.TaskFileService;
-import com.ruoyi.shop.util.FileConvertUtils;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.StringJoiner;
import java.util.stream.Collectors;
/**
@@ -84,16 +81,14 @@
* @return
*/
@Override
- public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page){
- List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page);
+ public List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, MgtMemberTaskPageDto mgtMemberTaskPageDto){
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
if(mgtMemberFollowPageVoList!=null&&!mgtMemberFollowPageVoList.isEmpty()){
Long followId;
List<TaskFile> taskFileList;
List<String> picture = new ArrayList<>();
List<String> video = new ArrayList<>();
List<String> audio = new ArrayList<>();
- Long shopId;
- Shop shop;
for(MgtMemberFollowPageVo mgtMemberFollowPageVo : mgtMemberFollowPageVoList){
followId = mgtMemberFollowPageVo.getFollowId();
taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
index f8f5bc9..b5f0db6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.shop.service.task.TaskFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
@@ -41,6 +42,11 @@
@Resource
private RemoteMemberService remoteMemberService;
+
+ @Resource
+ private TaskFileService taskFileService;
+
+
/**
*
* @param page
@@ -49,7 +55,7 @@
*/
@Override
public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
- String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
+ String today = DateUtils.parseDateToStr("YYYY-MM-DD",DateUtils.getNowDate());
List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
String taskDate;
@@ -72,7 +78,7 @@
@Override
public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){
MemberTask memberTask = new MemberTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
memberTask.setTaskId(taskId);
memberTask.setDelFlag(0);
memberTask.setTaskStatus(0);
@@ -80,7 +86,7 @@
memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
- memberTask.setCreateTime(new Date());
+ memberTask.setCreateTime(DateUtils.getNowDate());
this.saveOrUpdate(memberTask);
}
@@ -98,6 +104,8 @@
memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
+ memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
+ memberTaskRecord.setCreateTime(DateUtils.getNowDate());
memberTaskRecordService.saveOrUpdate(memberTaskRecord);
String picture = merFollowMemberTaskDto.getPicture();
String video = merFollowMemberTaskDto.getVideo();
@@ -113,6 +121,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(video)){
@@ -124,6 +133,7 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(2);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(audio)){
@@ -135,11 +145,12 @@
taskFile.setFollowFrom(2);
taskFile.setFileUrl(str);
taskFile.setFileType(3);
+ taskFileService.saveOrUpdate(taskFile);
}
}
if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
MemberTask memberTask = new MemberTask();
- String taskId = IdUtils.fastUUID();
+ String taskId = IdUtils.simpleUUID();
memberTask.setTaskId(taskId);
memberTask.setDelFlag(0);
memberTask.setShopId(oldMemberTask.getShopId());
@@ -147,7 +158,7 @@
memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
memberTask.setTaskStatus(2);
- memberTask.setCreateTime(new Date());
+ memberTask.setCreateTime(DateUtils.getNowDate());
this.saveOrUpdate(memberTask);
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java
new file mode 100644
index 0000000..435f9b1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskRecordServiceImpl.java
@@ -0,0 +1,89 @@
+package com.ruoyi.shop.service.impl.task;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
+import com.ruoyi.shop.domain.pojo.task.TaskFile;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+import com.ruoyi.shop.mapper.task.ShopTaskMapper;
+import com.ruoyi.shop.mapper.task.ShopTaskRecordMapper;
+import com.ruoyi.shop.service.task.ShopTaskRecordService;
+import com.ruoyi.shop.service.task.TaskFileService;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.service.RemoteUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 会员跟进任务记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-06-01
+ */
+@Service
+public class ShopTaskRecordServiceImpl extends ServiceImpl<ShopTaskRecordMapper, ShopTaskRecord> implements ShopTaskRecordService {
+
+ @Resource
+ private ShopTaskRecordMapper shopTaskRecordMapper;
+
+ @Resource
+ private TaskFileService taskFileService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ /**
+ * 平台分页获取平台跟进任务
+ * @param page
+ * @return
+ */
+ @Override
+ public List<MgtShopTaskRecordPageVo> pageMgtShopFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto){
+ List<MgtShopTaskRecordPageVo> mgtShopTaskRecordPageVoList = shopTaskRecordMapper.pageMgtShopFollow(page, mgtShopTaskPageDto);
+ if(mgtShopTaskRecordPageVoList!=null&&!mgtShopTaskRecordPageVoList.isEmpty()){
+ Long followId;
+ List<TaskFile> taskFileList;
+ List<String> picture = new ArrayList<>();
+ List<String> video = new ArrayList<>();
+ List<String> audio = new ArrayList<>();
+ Long userId;
+ SysUser sysUser;
+ for(MgtShopTaskRecordPageVo mgtShopTaskRecordPageVo : mgtShopTaskRecordPageVoList){
+ //获取任务用户信息
+ userId = mgtShopTaskRecordPageVo.getUserId();
+ sysUser = remoteUserService.getSysUser(userId).getData();
+ mgtShopTaskRecordPageVo.setUserName(sysUser.getNickName());
+ mgtShopTaskRecordPageVo.setUserPicture(sysUser.getAvatar());
+ //获取任务详情文件
+ followId = mgtShopTaskRecordPageVo.getFollowId();
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,1);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ picture = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,2);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ video = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ taskFileList = taskFileService.listByFollowIdAndFollowType(followId,3);
+ if(taskFileList!=null&&!taskFileList.isEmpty()){
+ audio = taskFileList.stream().map(k->k.getFileUrl()).collect(Collectors.toList());
+ }
+ mgtShopTaskRecordPageVo.setPicture(picture);
+ mgtShopTaskRecordPageVo.setVideo(video);
+ mgtShopTaskRecordPageVo.setAudio(audio);
+ }
+ }
+ return mgtShopTaskRecordPageVoList;
+ }
+
+
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 5fd6752..a5a63d7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -1,10 +1,25 @@
package com.ruoyi.shop.service.impl.task;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.ShopTask;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
+import com.ruoyi.shop.domain.pojo.task.TaskFile;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
import com.ruoyi.shop.mapper.task.ShopTaskMapper;
+import com.ruoyi.shop.service.task.ShopTaskRecordService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.shop.service.task.TaskFileService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,4 +32,73 @@
@Service
public class ShopTaskServiceImpl extends ServiceImpl<ShopTaskMapper, ShopTask> implements ShopTaskService {
+ @Resource
+ private ShopTaskMapper shopTaskMapper;
+
+ @Resource
+ private ShopTaskRecordService shopTaskRecordService;
+
+ @Resource
+ private TaskFileService taskFileService;
+
+
+
+ /**
+ * 平台跟进商户
+ * @param mgtFollowShopTaskDto
+ */
+ @Override
+ public void followShopTask(MgtFollowShopTaskDto mgtFollowShopTaskDto){
+ //创建本次任务
+ ShopTask shopTask = new ShopTask();
+ String taskId = IdUtils.simpleUUID();
+ shopTask.setTaskId(taskId);
+ shopTask.setDelFlag(0);
+ shopTask.setShopId(mgtFollowShopTaskDto.getShopId());
+ shopTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
+ shopTask.setNextFollowDate(DateUtils.getDate());
+ shopTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
+ shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
+ shopTask.setCreateTime(DateUtils.getNowDate());
+ this.saveOrUpdate(shopTask);
+ //创建任务记录
+ ShopTaskRecord shopTaskRecord = new ShopTaskRecord();
+ shopTaskRecord.setDelFlag(0);
+ shopTaskRecord.setTaskId(taskId);
+ shopTaskRecord.setUserId(mgtFollowShopTaskDto.getUserId());
+ shopTaskRecord.setFollowType(2);
+ shopTaskRecord.setFollowContent(mgtFollowShopTaskDto.getFollowContent());
+ shopTaskRecord.setCreateTime(DateUtils.getNowDate());
+ shopTaskRecordService.saveOrUpdate(shopTaskRecord);
+ //创建任务文件
+ String picture = mgtFollowShopTaskDto.getPicture();
+ String[] strArr;
+ TaskFile taskFile;
+ if(StringUtils.isNotBlank(picture)){
+ strArr = picture.split(",");
+ for(String str : strArr){
+ taskFile = new TaskFile();
+ taskFile.setDelFlag(0);
+ taskFile.setFollowId(shopTaskRecord.getId());
+ taskFile.setFollowFrom(3);
+ taskFile.setFileUrl(str);
+ taskFile.setFileType(1);
+ taskFileService.saveOrUpdate(taskFile);
+ }
+ }
+ //创建下一次任务
+ ShopTask shopNextTask = new ShopTask();
+ String nextTaskId = IdUtils.simpleUUID();
+ shopNextTask.setTaskId(nextTaskId);
+ shopNextTask.setDelFlag(0);
+ shopNextTask.setShopId(mgtFollowShopTaskDto.getShopId());
+ shopNextTask.setFollowType(mgtFollowShopTaskDto.getFollowType());
+ shopNextTask.setNextFollowDate(mgtFollowShopTaskDto.getNextTaskDate());
+ shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
+ shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
+ shopNextTask.setCreateTime(DateUtils.getNowDate());
+ this.saveOrUpdate(shopNextTask);
+ }
+
+
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
index b692436..0a03f2a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/AgencyTaskRecordService.java
@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.dto.MerAgencyTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.AgencyTaskRecord;
import com.ruoyi.shop.domain.vo.MerAgencyTaskRecordPageVo;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import java.util.List;
@@ -27,4 +30,12 @@
* @return
*/
List<MerAgencyTaskRecordPageVo> pageMerAgencyTaskRecord (Page page, MerAgencyTaskPageDto merAgencyTaskPageDto);
+
+
+ /**
+ * 平台分页获取代理商跟进任务
+ * @param page
+ * @return
+ */
+ List<MgtAgencyTaskRecordPageVo> pageMgtAgencyFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
index 39dfc97..f3c2e85 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo;
@@ -32,5 +33,5 @@
* @param page
* @return
*/
- List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page);
+ List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, MgtMemberTaskPageDto mgtMemberTaskPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java
new file mode 100644
index 0000000..9586a7a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskRecordService.java
@@ -0,0 +1,28 @@
+package com.ruoyi.shop.service.task;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
+import com.ruoyi.shop.domain.pojo.task.ShopTaskRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员跟进任务记录 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-06-01
+ */
+public interface ShopTaskRecordService extends IService<ShopTaskRecord> {
+
+
+ /**
+ * 平台分页获取平台跟进任务
+ * @param page
+ * @return
+ */
+ List<MgtShopTaskRecordPageVo> pageMgtShopFollow(Page page, MgtShopTaskPageDto mgtShopTaskPageDto);
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
index 41fea21..627b21f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopTaskService.java
@@ -1,7 +1,14 @@
package com.ruoyi.shop.service.task;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.MgtFollowShopTaskDto;
+import com.ruoyi.shop.domain.dto.MgtShopTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo;
+import com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +20,11 @@
*/
public interface ShopTaskService extends IService<ShopTask> {
+ /**
+ * 平台跟进商户
+ * @param mgtFollowShopTaskDto
+ */
+ void followShopTask(MgtFollowShopTaskDto mgtFollowShopTaskDto);
+
+
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index 2bbd79e..be23bba 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -304,7 +304,74 @@
LEFT JOIN sys_user sub ON sub.user_id = ts.belong_user_id
LEFT JOIN sys_dept sd ON sub.dept_id = sd.dept_id
LEFT JOIN t_shop_marketing tsm ON tsm.shop_id = ts.shop_id
-
+ WHERE ts.del_flag = 0
+ <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
+ AND ts.shop_province_code = #{param.shopProvinceCode}
+ </if>
+ <if test="param.shopCityCode!=null and param.shopCityCode!=''">
+ AND ts.shop_city_code = #{param.shopCityCode}
+ </if>
+ <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
+ AND ts.shop_area_code = #{param.shopAreaCode}
+ </if>
+ <if test="param.signTime!=null and param.signTime!=''">
+ AND ts.sign_time = #{param.signTime}
+ </if>
+ <if test="param.signProvinceCode!=null and param.signProvinceCode!=''">
+ AND ts.sign_province_code = #{param.signProvinceCode}
+ </if>
+ <if test="param.signCityCode!=null and param.signCityCode!=''">
+ AND ts.sign_city_code = #{param.signCityCode}
+ </if>
+ <if test="param.signAreaCode!=null and param.signAreaCode!=''">
+ AND ts.sign_area_code = #{param.signAreaCode}
+ </if>
+ <if test="param.shopStatus!=null and param.shopStatus!=''">
+ AND ts.shop_status = #{param.shopStatus}
+ </if>
+ <if test="param.recommendPerson!=null and param.recommendPerson!=''">
+ AND ts.recommend_person = #{param.recommendPerson}
+ </if>
+ <if test="param.belongUserId!=null and param.belongUserId!=''">
+ AND ts.belong_user_id = #{param.belongUserId}
+ </if>
+ <if test="param.shopSource!=null and param.shopSource!=''">
+ AND ts.shop_source = #{param.shopSource}
+ </if>
+ <if test="param.shopCustomStatus!=null and param.shopCustomStatus!=''">
+ AND AND FIND_IN_SET(#{param.shopCustomStatus},ts.shop_custom_status)
+ </if>
+ <if test="param.expireFlag!=null and param.expireFlag!=''">
+ AND ts.shop_status = 2
+ </if>
+ <if test="param.shopTags!=null and param.shopTags!=''">
+ AND FIND_IN_SET(#{param.shopTags},ts.shop_tags)
+ </if>
+ <if test="param.supportingCapacityFlag!=null and param.supportingCapacityFlag!=''">
+ AND ts.supporting_capacity_flag = #{param.supportingCapacityFlag}
+ </if>
+ <if test="param.operationPersonFlag!=null and param.operationPersonFlag!=''">
+ AND ts.operation_person_flag = #{param.operationPersonFlag}
+ </if>
+ <if test="param.executiveForceFlag!=null and param.executiveForceFlag!=''">
+ AND ts.executive_force_flag = #{param.executiveForceFlag}
+ </if>
+ <if test="param.patternFlag!=null and param.patternFlag!=''">
+ AND ts.pattern_flag = #{param.patternFlag}
+ </if>
+ <if test="param.connectionFlag!=null and param.connectionFlag!=''">
+ AND ts.connection_flag = #{param.connectionFlag}
+ </if>
+ <if test="param.economicAbilityFlag!=null and param.economicAbilityFlag!=''">
+ AND ts.economic_ability_flag = #{param.economicAbilityFlag}
+ </if>
+ <if test="param.relationPartner!=null and param.relationPartner!=''">
+ AND ts.relation_partner = #{param.relationPartner}
+ </if>
+ <if test="param.keyword!=null and param.keyword!=''">
+ AND (ts.shop_name LIKE CONCAT('%',#{param.keyword},'%') OR ts.shopowner_name LIKE CONCAT('%',#{param.keyword},'%')
+ OR ts.shopowner_phone LIKE CONCAT('%',#{param.keyword},'%') OR ts.shopNumber LIKE CONCAT('%',#{param.keyword},'%'))
+ </if>
</select>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
index b9e02bb..34913bf 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml
@@ -28,4 +28,22 @@
WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.agency_id = #{param.agencyId}
ORDER BY tmt.task_date DESC
</select>
+
+ <select id="pageMgtAgencyFollow" resultType="com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo">
+ SELECT
+ tmtr.user_id userId,
+ tmtr.id followId,
+ tmtr.task_id taskId,
+ tmt.create_time createTime,
+ tmtr.follow_type followType,
+ tmtr.call_time callTime,
+ tmtr.follow_content followContent,
+ tmtr.call_phone callPhone
+ FROM t_agency_task tmt
+ INNER JOIN t_agency_task_record tmtr ON tmtr.task_id = tmt.task_id
+ INNER JOIN t_shop ts ON ts.shop_id = tmt.shop_id
+ INNER JOIN t_shop_file tsf ON tsf.shop_id = ts.shop_id AND tsf.del_flag = 0 AND tsf.file_type = 1
+ WHERE tmt.del_flag = 0 AND tmt.agency_id = #{param.shopId}
+ ORDER BY tmt.task_date DESC
+ </select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml
index 6ac776d..155b59b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml
@@ -6,27 +6,27 @@
<result property="taskId" column="task_id" />
<result property="delFlag" column="del_flag" />
<result property="shopId" column="shop_id" />
- <result property="followTypeId" column="follow_type_id" />
+ <result property="followType" column="follow_type" />
<result property="followContent" column="follow_content" />
<result property="nextFollowDate" column="next_follow_date" />
<result property="taskTitle" column="task_title" />
- <result property="emergencyStateId" column="emergency_state_id" />
+ <result property="emergencyState" column="emergency_state" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectShopTaskVo">
- select task_id, del_flag, shop_id, follow_type_id, follow_content, next_follow_date, task_title, emergency_state_id, create_time from t_shop_task
+ select task_id, del_flag, shop_id, follow_type, follow_content, next_follow_date, task_title, emergency_state, create_time from t_shop_task
</sql>
<select id="selectShopTaskList" parameterType="ShopTask" resultMap="ShopTaskResult">
<include refid="selectShopTaskVo"/>
<where>
<if test="shopId != null "> and shop_id = #{shopId}</if>
- <if test="followTypeId != null "> and follow_type_id = #{followTypeId}</if>
+ <if test="followType != null "> and follow_type = #{followType}</if>
<if test="followContent != null and followContent != ''"> and follow_content = #{followContent}</if>
<if test="nextFollowDate != null "> and next_follow_date = #{nextFollowDate}</if>
<if test="taskTitle != null and taskTitle != ''"> and task_title = #{taskTitle}</if>
- <if test="emergencyStateId != null "> and emergency_state_id = #{emergencyStateId}</if>
+ <if test="emergencyState != null "> and emergency_state = #{emergencyState}</if>
</where>
</select>
@@ -41,22 +41,22 @@
<if test="taskId != null">task_id,</if>
<if test="delFlag != null">del_flag,</if>
<if test="shopId != null">shop_id,</if>
- <if test="followTypeId != null">follow_type_id,</if>
+ <if test="followType != null">follow_type,</if>
<if test="followContent != null">follow_content,</if>
<if test="nextFollowDate != null">next_follow_date,</if>
<if test="taskTitle != null">task_title,</if>
- <if test="emergencyStateId != null">emergency_state_id,</if>
+ <if test="emergencyState != null">emergency_state,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="shopId != null">#{shopId},</if>
- <if test="followTypeId != null">#{followTypeId},</if>
+ <if test="followType != null">#{followType},</if>
<if test="followContent != null">#{followContent},</if>
<if test="nextFollowDate != null">#{nextFollowDate},</if>
<if test="taskTitle != null">#{taskTitle},</if>
- <if test="emergencyStateId != null">#{emergencyStateId},</if>
+ <if test="emergencyState != null">#{emergencyState},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
@@ -66,11 +66,11 @@
<trim prefix="SET" suffixOverrides=",">
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="shopId != null">shop_id = #{shopId},</if>
- <if test="followTypeId != null">follow_type_id = #{followTypeId},</if>
+ <if test="followType != null">follow_type = #{followType},</if>
<if test="followContent != null">follow_content = #{followContent},</if>
<if test="nextFollowDate != null">next_follow_date = #{nextFollowDate},</if>
<if test="taskTitle != null">task_title = #{taskTitle},</if>
- <if test="emergencyStateId != null">emergency_state_id = #{emergencyStateId},</if>
+ <if test="emergencyState != null">emergency_state = #{emergencyState},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where task_id = #{taskId}
@@ -87,4 +87,22 @@
</foreach>
</delete>
+ <select id="pageMgtAgencyFollow" resultType="com.ruoyi.shop.domain.vo.MgtAgencyTaskRecordPageVo">
+ SELECT
+ tmtr.user_id userId,
+ tmtr.id followId,
+ tmtr.task_id taskId,
+ tmtr.create_time createTime,
+ tmtr.follow_type followType,
+ tmtr.call_time callTime,
+ tmtr.follow_content followContent,
+ tmtr.call_phone callPhone
+ FROM t_agency_task tmt
+ INNER JOIN t_agency_task_record tmtr ON tmtr.task_id = tmt.task_id
+ WHERE tmt.del_flag = 0 AND tmt.agency_id = #{param.shopId}
+ ORDER BY tmtr.create_time DESC
+ </select>
+
+
+
</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskRecordMapper.xml
new file mode 100644
index 0000000..61fff94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskRecordMapper.xml
@@ -0,0 +1,21 @@
+<?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="com.ruoyi.shop.mapper.task.ShopTaskRecordMapper">
+
+ <select id="pageMgtShopFollow" resultType="com.ruoyi.shop.domain.vo.MgtShopTaskRecordPageVo">
+ SELECT
+ tmtr.user_id userId,
+ tmtr.id followId,
+ tmtr.task_id taskId,
+ tmtr.create_time createTime,
+ CASE tmtr.follow_type WHEN 1 THEN "电话跟进" WHEN 2 THEN "手动跟进" END followType,
+ tmtr.follow_content followContent,
+ tmtr.call_time callTime,
+ tmtr.call_phone callPhone
+ FROM t_shop_task tmt
+ INNER JOIN t_shop_task_record tmtr ON tmtr.task_id = tmt.task_id
+ WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId}
+ ORDER BY tmtr.create_time DESC
+ </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
index b592228..9436b8c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
@@ -53,7 +54,7 @@
recommendCooperation.setRecommendUserId(merRecommendCooperationDto.getUserId());
recommendCooperation.setShopId(merRecommendCooperationDto.getShopId());
recommendCooperation.setCorpStatus(1);
- recommendCooperation.setCreateTime(new Date());
+ recommendCooperation.setCreateTime(DateUtils.getNowDate());
this.save(recommendCooperation);
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index 17e8fda..c3988b5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -8,6 +8,7 @@
import javax.validation.Validator;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -602,19 +603,19 @@
switch (editType){
case 1:
sysUser.setNickName(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 2:
sysUser.setAvatar(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
case 3:
sysUser.setSex(editValue);
- sysUser.setUpdateTime(new Date());
+ sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUpdateBy(String.valueOf(appEditUserDto.getUserId()));
userMapper.updateUser(sysUser);
break;
--
Gitblit v1.7.1