From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 65 +----
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 134 +++++-----
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java | 33 --
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 5
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java | 20 +
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml | 12
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java | 3
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 127 +++++-----
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java | 4
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java | 1
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java | 12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java | 4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml | 18
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java | 3
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml | 12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 3
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 39 +-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java | 12
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCooperationGetVo.java | 25 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 3
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml | 8
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 20 +
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml | 4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml | 8
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 36 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java | 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java | 3
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java | 3
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java | 9
44 files changed, 388 insertions(+), 295 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index e26f4c3..310c3d3 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -163,6 +163,9 @@
@TableField("belong_district")
private String belongDistrict;
+ @TableField("frozen_flag")
+ private Integer frozenFlag;
+
@Override
protected Serializable pkVal() {
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 2c46dad..311c37b 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -138,12 +138,12 @@
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号： 已被删除");
+ throw new ServiceException("028-88888888",501);
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号： 已停用");
+ throw new ServiceException("028-88888888",501);
}
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
}
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index 345b2ad..1015951 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -85,6 +85,7 @@
{
try
{
+ //
// 上传并返回访问地址
String url = OBSUploadUtils.uploadFile(file);
return R.ok(url);
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
index 54fd586..0d8bb1d 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java
@@ -53,6 +53,7 @@
try {
String fileName = FileUploadUtils.extractFilename(file);
+ System.out.println(fileName + "开始上传");
String prefix = fileName.substring(fileName.lastIndexOf("."));
String objectName = filePath + uuid + prefix;
InputStream inputStream = file.getInputStream();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java
index bd28c28..8a5b1b6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java
@@ -66,4 +66,7 @@
@ApiModelProperty(value = "还可以购买数量")
private Integer availableBuyNum;
+
+ @ApiModelProperty(value = "活动id")
+ private String activityId;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java
index ef9d76a..31cf0f6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java
@@ -41,4 +41,7 @@
@ApiModelProperty(value = "活动售价")
private BigDecimal activityPrice;
+
+ @ApiModelProperty(value = "活动id")
+ private String activityId;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java
index 33e33d0..9196c6e 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java
@@ -75,7 +75,14 @@
}
String requestBodyStr = stringBuilder.toString();
if(StringUtils.isNotBlank(requestBodyStr)){
- return JSONObject.parseObject(stringBuilder.toString(), Map.class);
+ Map<String, String> result = new HashMap<>();
+ try {
+ result = JSONObject.parseObject(stringBuilder.toString(), Map.class);
+ } catch (Exception e) {
+ log.info("requestBodyStr-error -> " + requestBodyStr);
+ e.printStackTrace();
+ }
+ return result;
}
return new HashMap<>();
}
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 f2227e1..c383a98 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
@@ -179,7 +179,7 @@
ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appGoodsInfoGetDto.getShopId(),goods.getGoodsId());
if(shopGoods!=null){
appGoodsInfoVo.setSalesPrice(shopGoods.getSalesPrice());
- appGoodsInfoVo.setSalesNum(shopGoods.getServiceNum());
+ appGoodsInfoVo.setServiceNum(shopGoods.getServiceNum());
}
//活动商品判断
if(appGoodsInfoGetDto.getActivityFlag()==1){
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
index f9f025d..9b6ea7a 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
@@ -43,10 +43,10 @@
AND ta.activity_status = #{param.activityStatus}
</if>
<if test="param.createStartTime!=null and param.createStartTime != ''">
- AND ta.create_time >= #{param.createStartTime}
+ AND Date(ta.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime != ''">
- AND ta.create_time <= #{createEndTime}
+ AND Date(ta.create_time) <= #{param.createEndTime}
</if>
</select>
@@ -61,10 +61,10 @@
AND FIND_IN_SET(#{param.userIds}, user_id) > 0
</if>
<if test="param.createStartTime!=null and param.createStartTime != ''">
- AND create_time >= #{param.createStartTime}
+ AND Date(ta.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime != ''">
- AND create_time <= #{createEndTime}
+ AND Date(ta.create_time) <= #{param.createEndTime}
</if>
<if test="param.orderFlag!=null and param.orderFlag == 1">
AND order_id IS NOT NULL
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 2f5b061..a5151f3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -153,12 +153,7 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN "周期"
- WHEN 2 THEN "服务"
- WHEN 3 THEN "体验"
- WHEN 4 THEN "单品"
- END goodsTag,
+ tg.goods_tags goodsTag,
IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses
@@ -175,16 +170,12 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN "周期"
- WHEN 2 THEN "服务"
- WHEN 3 THEN "体验"
- WHEN 4 THEN "单品"
- END goodsTag,
+ tg.goods_tags goodsTag,
IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses,
- tag.activity_price activityPrice
+ tag.activity_price activityPrice,
+ tag.activity_id activityId
FROM t_activity_goods tag
INNER JOIN t_goods tg ON tag.goods_id = tg.goods_id
LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
@@ -200,12 +191,7 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN "周期"
- WHEN 2 THEN "服务"
- WHEN 3 THEN "体验"
- WHEN 4 THEN "单品"
- END goodsTag,
+ tg.goods_tags goodsTag,
IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses
@@ -254,12 +240,7 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN "周期"
- WHEN 2 THEN "服务"
- WHEN 3 THEN "体验"
- WHEN 4 THEN "单品"
- END goodsTag,
+ tg.goods_tags goodsTag,
IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses
@@ -280,19 +261,15 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN '周期'
- WHEN 2 THEN '服务'
- WHEN 3 THEN '体验'
- WHEN 4 THEN '单品'
- END goodsTag,
+ tg.goods_tags goodsTag,
GREATEST(tg.sales_price, IFNULL(tsg.sales_price, 0.00)) salesPrice,
tag.activity_price activityPrice,
tgf.file_url goodsPicture,
tg.goods_nurses goodsNurses,
tag.activity_number activityNumber,
tag.sales_number salesNumber,
- tag.activity_deadline endTime
+ tag.activity_deadline endTime,
+ tag.activity_id activityId
FROM t_activity_goods tag
INNER JOIN t_goods tg ON tg.goods_id = tag.goods_id
LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
@@ -316,12 +293,7 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN "周期"
- WHEN 2 THEN "服务"
- WHEN 3 THEN "体验"
- WHEN 4 THEN "单品"
- END goodsTag,
+ tg.goods_tags goodsTag,
IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
tg.sales_price suggestSalesPrice,
tgf.file_url goodsPicture,
@@ -380,11 +352,11 @@
<if test="param.goodsClassId != null and param.goodsClassId != ''">
AND tg.goods_class_id = #{param.goodsClassId}
</if>
- <if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tg.create_time >= #{param.createStartTime}
+ <if test="param.createStartTime!=null and param.createStartTime != ''">
+ AND Date(ta.create_time) >= #{param.createStartTime}
</if>
- <if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tg.create_time <= #{param.createEndTime}
+ <if test="param.createEndTime!=null and param.createEndTime != ''">
+ AND Date(ta.create_time) <= #{param.createEndTime}
</if>
<if test="param.goodsName != null and param.goodsName != ''">
AND tg.goods_name LIKE CONCAT('%',#{param.goodsName},'%')
@@ -410,7 +382,7 @@
</update>
<select id="listGoodsByGoodsId" resultType="com.ruoyi.system.api.domain.poji.goods.Goods">
- select goods_id, del_flag, goods_status, goods_type, create_time, create_user_id, update_time, update_user_id, goods_class_id, goods_name, cycle_num_flag, service_num, goods_introduction, sales_price, mininum_price, subscription_flag, subscription, recommend_flag, goods_nurses, goods_tags, goods_no from t_goods FROM t_goods WHERE del_flag = 0 AND FIND_IN_SET(goods_id,#{goodsIds}) > 0
+ select goods_id, del_flag, goods_status, goods_type, create_time, create_user_id, update_time, update_user_id, goods_class_id, goods_name, cycle_num_flag, service_num, goods_introduction, sales_price, mininum_price, subscription_flag, subscription, recommend_flag, goods_nurses, goods_tags, goods_no FROM t_goods WHERE del_flag = 0 AND FIND_IN_SET(goods_id,#{goodsIds}) > 0
</select>
<select id="pageMgtSelectGoods" resultType="com.ruoyi.system.api.domain.vo.MgtSelectGoodsPageVo">
@@ -467,12 +439,7 @@
tg.goods_name goodsName,
tg.goods_introduction goodsIntroduction,
tg.goods_type goodsType,
- CASE tg.goods_type
- WHEN 1 THEN '周期'
- WHEN 2 THEN '服务'
- WHEN 3 THEN '体验'
- WHEN 4 THEN '单品'
- END goodsTag,
+ tg.goods_tags goodsTag,
GREATEST(tg.sales_price, IFNULL(tsg.sales_price, 0.00)) salesPrice,
tag.activity_price activityPrice,
tgf.file_url goodsPicture,
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
index 46c72b7..bc99279 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
@@ -242,7 +242,7 @@
}
@RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST)
- @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
+ @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
@ApiOperation(value = "冻结会员")
public R mgtReplayMemberSuggest(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
index 1b74dfc..53d6dd9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
@@ -60,4 +60,7 @@
@ApiModelProperty(value = "核销店铺")
private String verifyShopName;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
index 08e6bbb..7e9fa0f 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java
@@ -31,4 +31,7 @@
@ApiModelProperty(value = "获奖时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
index e25929f..bf885d1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java
@@ -54,4 +54,7 @@
@ApiModelProperty(value="积分")
private Integer integral;
+
+ @ApiModelProperty(value="是否会员0否1是")
+ private Integer memberFlag;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
index ff21aaa..92e79d4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
@@ -103,4 +103,7 @@
@ApiModelProperty(value = "活动参与次数")
@Excel(name = "活动参与次数", width = 30)
private Integer activityTotal;
+
+ @ApiModelProperty(value = "头像")
+ private String head;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
index a0c99fa..f15aace 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -642,6 +642,12 @@
*/
@Override
public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId){
- return birthdayCardMapper.pageAppMemberPrize(page, userId);
+ List<AppMemberPrizePageVo> memberPrizePageVoList = birthdayCardMapper.pageAppMemberPrize(page, userId);
+ if(memberPrizePageVoList!=null&&!memberPrizePageVoList.isEmpty()){
+ for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
+ appMemberPrizePageVo.setVerifyCode("3-"+appMemberPrizePageVo.getPrizeId());
+ }
+ }
+ return memberPrizePageVoList;
}
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index 2fed412..48553ab 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -1048,7 +1048,7 @@
relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
if(StringUtils.isNotBlank(relGoodsIds)){
goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
+ if(goodsList!=null&&!goodsList.isEmpty()){
goodsLimitList = goodsList.stream().map(goods -> {
String goodsName = goods.getGoodsName();
goodsName = "限制" + goodsName + "适用";
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
index 9ac6a3c..ec8fe29 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -185,6 +185,9 @@
HashSet<Long> shopIdSet = new HashSet<>();
for(AppMemberCouponPageVo appGetAbleCouponPageVo : memberCouponPageVoList){
shopIdSet.add(appGetAbleCouponPageVo.getShopId());
+ if(appGetAbleCouponPageVo.getCouponType()==4){
+ appGetAbleCouponPageVo.setVerifyCode("2-"+appGetAbleCouponPageVo.getMemberCouponId());
+ }
}
String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
@@ -196,7 +199,7 @@
relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
if(StringUtils.isNotBlank(relGoodsIds)){
goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
+ if(goodsList!=null&&!goodsList.isEmpty()){
goodsLimitList = goodsList.stream().map(goods -> {
String goodsName = goods.getGoodsName();
goodsName = "限制" + goodsName + "适用";
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 f6a8349..cb6e64a 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
@@ -21,7 +21,10 @@
import com.ruoyi.member.domain.pojo.member.MemberTotal;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.member.MemberMapper;
-import com.ruoyi.member.service.member.*;
+import com.ruoyi.member.service.member.IntegralRecordService;
+import com.ruoyi.member.service.member.MemberArchiveService;
+import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.member.service.member.MemberTotalService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
@@ -46,6 +49,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -840,6 +845,19 @@
if (StringUtils.isNotBlank(merMemberPageDto.getMemberTags())) {
merMemberPageDto.setMemberTags(merMemberPageDto.getMemberTags().replace(",", "|"));
}
+ //处理生日
+ if(merMemberPageDto.getStartAge()!=null){
+ LocalDate currentDate = LocalDate.now();
+ LocalDate endBirthday = currentDate.minusYears(merMemberPageDto.getStartAge());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ merMemberPageDto.setEndBirthday(endBirthday.format(formatter));
+ }
+ if(merMemberPageDto.getEndAge()!=null){
+ LocalDate currentDate = LocalDate.now();
+ LocalDate startBirthday = currentDate.minusYears(merMemberPageDto.getEndAge());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
+ }
//查询获取结果列表
List<MgtMemberPageVo> memberPageVoList = memberMapper.pageMgtMember(page, merMemberPageDto);
//处理活跃度返回
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
index 9cee2cb..7392618 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
@@ -188,10 +188,10 @@
AND tc.coupon_name LIKE CONCAT('%',#{param.couponName},'%')
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tc.create_time >= #{param.createStartTime}
+ AND Date(tc.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tc.create_time <= #{param.createEndTime}
+ AND Date(tc.create_time) <= #{param.createEndTime}
</if>
</select>
@@ -247,10 +247,10 @@
AND tc.coupon_name LIKE CONCAT('%',#{param.couponName},'%')
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tc.create_time >= #{param.createStartTime}
+ AND Date(tc.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tc.create_time <= #{param.createEndTime}
+ AND Date(tc.create_time) <= #{param.createEndTime}
</if>
</select>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml
index 10af402..8ffcd59 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml
@@ -20,10 +20,10 @@
AND tbr.browse_type = #{param.browseType}
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tbr.create_time >= #{param.createStartTime}
+ AND Date(tbr.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tbr.create_time <= #{param.createEndTime}
+ AND Date(tbr.create_time) <= #{param.createEndTime}
</if>
ORDER BY tbr.create_time DESC
</select>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml
index d255946..7db31c0 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml
@@ -12,10 +12,10 @@
FROM t_integral_record tir
WHERE tir.del_flag = 0 AND tir.user_id = #{param.memberUserId}
<if test="param.changeStartDate != null and param.changeStartDate != ''">
- AND tir.create_time >= #{param.changeStartDate}
+ AND Date(tir.create_time) >= #{param.changeStartDate}
</if>
<if test="param.changeEndDate != null and param.changeEndDate != ''">
- AND tir.create_time <= #{param.changeEndDate}
+ AND Date(tir.create_time) <= #{param.changeEndDate}
</if>
ORDER BY tir.create_time DESC
</select>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
index 4489b5b..8cd639d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -174,19 +174,19 @@
AND FIND_IN_SET(#{param.memberTag},tm.user_tags) > 0
</if>
<if test="param.startMemberDate!=null and param.startMemberDate!=''">
- AND tm.create_time >= #{param.startMemberDate}
+ AND Date(tm.create_time) >= #{param.startMemberDate}
</if>
<if test="param.endMemberDate!=null and param.endMemberDate!=''">
- AND tm.create_time <= #{param.endMemberDate}
+ AND Date(tm.create_time) <= #{param.endMemberDate}
</if>
<if test="param.memberFrom != null and param.memberFrom != ''">
AND tm.customer_source = #{param.memberFrom}
</if>
<if test="param.taskStartDate!=null and param.taskStartDate!=''">
- AND tmt.next_task_time >= #{param.taskStartDate}
+ AND Date(tmt.next_task_time) >= #{param.taskStartDate}
</if>
<if test="param.taskEndDate!=null and param.taskEndDate!=''">
- AND tmt.next_task_time <= #{param.taskEndDate}
+ AND Date(tmt.next_task_time) <= #{param.taskEndDate}
</if>
<if test="param.surpNum != null and param.surpNum != ''">
AND tmt.useable_service_count = #{param.surpNum}
@@ -195,10 +195,10 @@
AND FIND_IN_SET(#{param.memberNurse},tm.member_nurse) > 0
</if>
<if test="param.actStartDate!=null and param.actStartDate!=''">
- AND tmt.last_pay_time >= #{param.actStartDate}
+ AND Date(tmt.last_pay_time) >= #{param.actStartDate}
</if>
<if test="param.actEndDate!=null and param.actEndDate!=''">
- AND tmt.last_pay_time <= #{param.actEndDate}
+ AND Date(tmt.last_pay_time) <= #{param.actEndDate}
</if>
<if test="param.keyword != null and param.keyword != ''">
AND (tm.real_name LIKE CONCAT('%',#{param.keyword},'%') OR tm.mobile LIKE CONCAT('%',#{param.keyword},'%') OR tm.referrer LIKE CONCAT('%',#{param.keyword},'%'))
@@ -241,7 +241,8 @@
tm.referrer referrer,
tm.customer_source memberFrom,
tmt.total_pay_money totalPayMoney,
- tmt.total_activity_count activityTotal
+ tmt.total_activity_count activityTotal,
+ tm.avatar head
FROM t_member tm
LEFT JOIN t_member_total tmt ON tm.member_id = tmt.member_id
WHERE tm.del_flag = 0
@@ -252,12 +253,12 @@
AND tm.belong_district = #{param.belongDistrict}
</if>
<if test="param.createTime != null and param.createTime != ''">
- AND tm.create_time = #{param.createTime}
+ AND Date(tm.create_time) = #{param.createTime}
</if>
<if test="param.lastPayTime != null and param.lastPayTime != ''">
AND tmt.last_pay_time = #{param.lastPayTime}
</if>
- <if test="param.memberFlag != null and param.memberFlag != ''">
+ <if test="param.memberFlag != null ">
AND tm.binding_flag = #{param.memberFlag}
</if>
<if test="param.goodsType != null and param.goodsType != ''">
@@ -270,7 +271,7 @@
AND tm.customer_source = #{param.memberFrom}
</if>
<if test="param.referrer != null and param.referrer != ''">
- AND tm.referrer = #{param.referrer}
+ AND tm.referrer LIKE CONCAT('%',#{param.referrer},'%')
</if>
<if test="param.gender != null">
AND tm.gender = #{param.gender}
@@ -288,10 +289,10 @@
AND tmt.total_integral <= #{param.endIntegral}
</if>
<if test="param.actStartDate != null and param.actStartDate != ''">
- AND tmt.last_pay_time >= #{param.actStartDate}
+ AND Date(tmt.last_pay_time) >= #{param.actStartDate}
</if>
<if test="param.actEndDate != null and param.actEndDate != ''">
- AND tmt.last_pay_time <= #{param.actEndDate}
+ AND Date(tmt.last_pay_time) <= #{param.actEndDate}
</if>
<if test="param.startPayCount != null and param.startPayCount != ''">
AND tmt.total_pay_count >= #{param.startPayCount}
@@ -350,7 +351,7 @@
</select>
<select id="memberToday" resultType="java.lang.Integer">
- SELECT COUNT(user_id) FROM t_member WHERE del_flag = 0 AND create_time = CURDATE()
+ SELECT COUNT(user_id) FROM t_member WHERE del_flag = 0 AND Date(create_time) = CURDATE()
</select>
<select id="getTotalMemberTotal" resultType="com.ruoyi.member.domain.vo.MgtTotalMemberTotalVo">
@@ -367,10 +368,10 @@
AND relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -403,10 +404,10 @@
AND relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -420,10 +421,10 @@
AND relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE member_nurse IS NOT NULL OR member_nurse != ''
@@ -438,10 +439,10 @@
AND relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
GROUP BY level
</select>
@@ -456,10 +457,10 @@
AND relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE goods_type IS NOT NULL OR goods_type != ''
@@ -476,10 +477,10 @@
AND tm.relation_shop_id = #{shopId}
</if>
<if test="actStartDate != null and actStartDate != ''">
- AND tmt.last_pay_time >= #{actStartDate}
+ AND Date(tmt.last_pay_time) >= #{actStartDate}
</if>
<if test="actEndDate != null and actEndDate != ''">
- AND tmt.last_pay_time <= #{actEndDate}
+ AND Date(tmt.last_pay_time) <= #{actEndDate}
</if>
</select>
@@ -494,10 +495,10 @@
AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
ORDER BY tmt.total_pay_count DESC LIMIT 15
</select>
@@ -511,10 +512,10 @@
AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
GROUP BY tm.customer_source
ORDER BY COUNT(tm.user_id) DESC LIMIT 15
@@ -572,10 +573,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -592,10 +593,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE member_nurse IS NOT NULL OR member_nurse != ''
@@ -613,10 +614,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
GROUP BY level
</select>
@@ -634,10 +635,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE goods_type IS NOT NULL OR goods_type != ''
@@ -657,10 +658,10 @@
</foreach>
</if>
<if test="actStartDate != null and actStartDate != ''">
- AND tmt.last_pay_time >= #{actStartDate}
+ AND Date(tmt.last_pay_time) >= #{actStartDate}
</if>
<if test="actEndDate != null and actEndDate != ''">
- AND tmt.last_pay_time <= #{actEndDate}
+ AND Date(tmt.last_pay_time) <= #{actEndDate}
</if>
</select>
@@ -678,10 +679,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
ORDER BY tmt.total_pay_count DESC LIMIT 15
</select>
@@ -698,10 +699,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
GROUP BY tm.customer_source
ORDER BY COUNT(tm.user_id) DESC LIMIT 15
@@ -719,10 +720,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
GROUP BY tm.relation_shop_name
ORDER BY COUNT(tm.user_id) DESC LIMIT 15
@@ -761,10 +762,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -788,10 +789,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -811,10 +812,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE member_nurse IS NOT NULL OR member_nurse != ''
@@ -835,10 +836,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
GROUP BY level
</select>
@@ -859,10 +860,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
) x
WHERE goods_type IS NOT NULL OR goods_type != ''
@@ -885,10 +886,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
</select>
@@ -909,10 +910,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
ORDER BY tmt.total_pay_count DESC LIMIT 15
</select>
@@ -932,10 +933,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
GROUP BY tm.customer_source
ORDER BY COUNT(tm.user_id) DESC LIMIT 15
@@ -957,10 +958,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND tm.create_time >= #{param.startDate}
+ AND Date(tm.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND tm.create_time <= #{param.endDate}
+ AND Date(tm.create_time) <= #{param.endDate}
</if>
GROUP BY tm.referrer
ORDER BY COUNT(tm.user_id) DESC LIMIT 15
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml
index b851b84..c3e2a25 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml
@@ -47,10 +47,10 @@
AND (tm.real_name LIKE CONCAT('%',#{param.keyword},'%') OR tm.nick_name LIKE CONCAT('%',#{param.keyword},'%') OR tm.mobile LIKE CONCAT('%',#{param.keyword},'%') OR tms.replay_user_name LIKE CONCAT('%',#{param.keyword},'%') OR tms.shop_replay_user_name LIKE CONCAT('%',#{param.keyword},'%'))
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tms.create_time >= #{param.createStartTime}
+ AND Date(tms.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tms.create_time <= #{param.createEndTime}
+ AND Date(tms.create_time) <= #{param.createEndTime}
</if>
<if test="param.suggestStatus!=null and param.suggestStatus!=''">
AND tms.replay_flag = #{param.suggestStatus}
@@ -62,16 +62,16 @@
AND tms.suggest_tags REGEXP #{param.tags}
</if>
<if test="param.shopReplayStartTime!=null and param.shopReplayStartTime!=''">
- AND tms.shop_replay_time >= #{param.shopReplayStartTime}
+ AND Date(tms.shop_replay_time) >= #{param.shopReplayStartTime}
</if>
<if test="param.shopReplayEndTime!=null and param.shopReplayEndTime!=''">
- AND tms.shop_replay_time <= #{param.shopReplayEndTime}
+ AND Date(tms.shop_replay_time) <= #{param.shopReplayEndTime}
</if>
<if test="param.replayStartTime!=null and param.replayStartTime!=''">
- AND tms.replay_time >= #{param.replayStartTime}
+ AND Date(tms.replay_time) >= #{param.replayStartTime}
</if>
<if test="param.replayEndTime!=null and param.replayEndTime!=''">
- AND tms.replay_time <= #{param.replayEndTime}
+ AND Date(tms.replay_time) <= #{param.replayEndTime}
</if>
<if test="param.suggestType!=null and param.suggestType!=''">
AND tms.suggest_type = #{param.suggestType}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 2ff23a1..9d03ec7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -331,10 +331,10 @@
AND toc.order_from = #{param.orderFrom}
</if>
<if test="param.startOrderDate != null and param.startOrderDate != '' ">
- AND toc.create_time >= #{param.startOrderDate}
+ AND Date(toc.create_time) >= #{param.startOrderDate}
</if>
<if test="param.endOrderDate != null and param.endOrderDate != '' ">
- AND toc.create_time <= #{param.endOrderDate}
+ AND Date(toc.create_time) <= #{param.endOrderDate}
</if>
<if test="param.keyword != null and param.keyword != ''">
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR tog.goods_name LIKE CONCAT('%',#{param.keyword},'%'))
@@ -370,10 +370,10 @@
AND toc.order_status = #{param.orderStatus}
</if>
<if test="param.startOrderDate != null and param.startOrderDate != '' ">
- AND toc.create_time >= #{param.startOrderDate}
+ AND Date(toc.create_time) >= #{param.startOrderDate}
</if>
<if test="param.endOrderDate != null and param.endOrderDate != '' ">
- AND toc.create_time <= #{param.endOrderDate}
+ AND Date(toc.create_time) <= #{param.endOrderDate}
</if>
<if test="param.keyword != null and param.keyword != ''">
AND toc.order_no LIKE CONCAT('%',#{param.keyword},'%')
@@ -418,10 +418,10 @@
AND toc.order_from = #{param.orderFrom}
</if>
<if test="param.startOrderDate != null and param.startOrderDate != ''">
- AND toc.create_time >= #{param.startOrderDate}
+ AND Date(toc.create_time) >= #{param.startOrderDate}
</if>
<if test="param.endOrderDate != null and param.endOrderDate != ''">
- AND toc.create_time <= #{param.endOrderDate}
+ AND Date(toc.create_time) <= #{param.endOrderDate}
</if>
<if test="param.keyword != null and param.keyword != ''">
AND toc.order_no LIKE CONCAT('%',#{param.keyword},'%')
@@ -463,10 +463,10 @@
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0)
</if>
<if test="param.verifyStartTime != null and param.verifyStartTime != ''">
- AND toc.use_time >= #{param.verifyStartTime}
+ AND Date(toc.use_time) >= #{param.verifyStartTime}
</if>
<if test="param.verifyEndTime != null and param.verifyEndTime != ''">
- AND toc.use_time <= #{param.verifyEndTime}
+ AND Date(toc.use_time) <= #{param.verifyEndTime}
</if>
ORDER BY toc.create_time DESC
</select>
@@ -503,10 +503,10 @@
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0)
</if>
<if test="param.verifyStartTime != null and param.verifyStartTime != ''">
- AND toc.use_time >= #{param.verifyStartTime}
+ AND Date(toc.use_time) >= #{param.verifyStartTime}
</if>
<if test="param.verifyEndTime != null and param.verifyEndTime != ''">
- AND toc.use_time <= #{param.verifyEndTime}
+ AND Date(toc.use_time) <= #{param.verifyEndTime}
</if>
GROUP BY toc.order_id) AS temp
</select>
@@ -536,10 +536,10 @@
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0)
</if>
<if test="param.verifyStartTime != null and param.verifyStartTime != ''">
- AND toc.use_time >= #{param.verifyStartTime}
+ AND Date(toc.use_time) >= #{param.verifyStartTime}
</if>
<if test="param.verifyEndTime != null and param.verifyEndTime != ''">
- AND toc.use_time <= #{param.verifyEndTime}
+ AND Date(toc.use_time) <= #{param.verifyEndTime}
</if>
GROUP BY toc.order_id) AS temp
</select>
@@ -575,10 +575,10 @@
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0)
</if>
<if test="param.verifyStartTime != null and param.verifyStartTime != ''">
- AND toc.use_time >= #{param.verifyStartTime}
+ AND Date(toc.use_time) >= #{param.verifyStartTime}
</if>
<if test="param.verifyEndTime != null and param.verifyEndTime != ''">
- AND toc.use_time <= #{param.verifyEndTime}
+ AND Date(toc.use_time) <= #{param.verifyEndTime}
</if>
GROUP BY toc.order_id) AS temp
</select>
@@ -617,10 +617,10 @@
AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0)
</if>
<if test="param.verifyStartTime != null and param.verifyStartTime != ''">
- AND toc.use_time >= #{param.verifyStartTime}
+ AND Date(toc.use_time) >= #{param.verifyStartTime}
</if>
<if test="param.verifyEndTime != null and param.verifyEndTime != ''">
- AND toc.use_time <= #{param.verifyEndTime}
+ AND Date(toc.use_time) <= #{param.verifyEndTime}
</if>
ORDER BY toc.create_time DESC
</select>
@@ -650,10 +650,10 @@
AND shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -678,10 +678,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
</select>
@@ -700,10 +700,10 @@
AND toc.shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
</select>
@@ -716,7 +716,7 @@
t_order
WHERE
del_flag = 0
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -752,10 +752,10 @@
AND toc.shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_name
ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
@@ -775,10 +775,10 @@
AND toc.shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY toc.order_from
ORDER BY SUM(toc.order_money) DESC LIMIT 15
@@ -794,10 +794,10 @@
AND shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -826,7 +826,7 @@
t_order
WHERE
del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -843,7 +843,7 @@
t_order
WHERE
del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -857,7 +857,7 @@
t_order
WHERE
del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -896,10 +896,10 @@
AND o.shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND o.create_time >= #{param.startDate}
+ AND Date(o.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND o.create_time <= #{param.endDate}
+ AND Date(o.create_time) <= #{param.endDate}
</if>
GROUP BY o.user_id
) AS user_goods_type_counts
@@ -913,10 +913,10 @@
AND shop_id = #{param.shopId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -968,10 +968,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_name
ORDER BY COUNT(DISTINCT toc.user_id) DESC LIMIT 15
@@ -996,10 +996,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -1021,10 +1021,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
</select>
@@ -1037,7 +1037,7 @@
t_order
WHERE
del_flag = 0
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
AND shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
@@ -1082,10 +1082,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_name
ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
@@ -1108,10 +1108,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY toc.order_from
ORDER BY SUM(toc.order_money) DESC LIMIT 10
@@ -1130,10 +1130,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -1162,7 +1162,7 @@
IFNULL(SUM(order_money),0) AS mapValueSecond
FROM t_order
WHERE del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
AND shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
@@ -1180,7 +1180,7 @@
DISTINCT user_id
FROM t_order
WHERE del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
AND shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
@@ -1195,7 +1195,7 @@
COUNT(DISTINCT user_id) AS mapValue
FROM t_order
WHERE del_flag = 0 AND order_from = 2
- AND create_time >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+ AND Date(create_time) >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
AND shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
@@ -1312,10 +1312,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND create_time >= #{param.startDate}
+ AND Date(create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND create_time <= #{param.endDate}
+ AND Date(create_time) <= #{param.endDate}
</if>
</select>
@@ -1350,10 +1350,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_type
</select>
@@ -1375,10 +1375,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_name
ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
@@ -1404,10 +1404,10 @@
</foreach>
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY toc.order_from
ORDER BY SUM(toc.order_money) DESC LIMIT 15
@@ -1452,10 +1452,10 @@
AND toc.shop_id = #{param.shopId}
</if>
<if test="param.startOrderDate != null and param.startOrderDate != '' ">
- AND toc.create_time >= #{param.startOrderDate}
+ AND Date(toc.create_time) >= #{param.startOrderDate}
</if>
<if test="param.endOrderDate != null and param.endOrderDate != '' ">
- AND toc.create_time <= #{param.endOrderDate}
+ AND Date(toc.create_time) <= #{param.endOrderDate}
</if>
ORDER BY toc.create_time DESC
</select>
@@ -1482,10 +1482,10 @@
AND toc.activity_id = #{param.activityId}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND toc.create_time >= #{param.startDate}
+ AND Date(toc.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND toc.create_time <= #{param.endDate}
+ AND Date(toc.create_time) <= #{param.endDate}
</if>
</select>
@@ -1503,7 +1503,7 @@
FROM t_order toc WHERE toc.del_flag = 0 AND toc.shop_id = #{param.shopId} GROUP BY toc.user_id) AS firstOrder)
AND toa.order_from = 2
<if test="param.activityId !=null and param.activityId != ''">
- AND toc.activity_id = #{param.activityId}
+ AND toa.activity_id = #{param.activityId}
</if>
</select>
@@ -1552,7 +1552,7 @@
<if test="param.goodsType !=null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
- GROUP BY toc.order_date
+ GROUP BY toc.create_time
</select>
<select id="getStaffActivityMemberTotal" resultType="com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo">
@@ -1568,6 +1568,6 @@
<if test="param.goodsType !=null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
- GROUP BY toc.order_date
+ GROUP BY toc.create_time
</select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
index 35f7d29..94f3a8f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml
@@ -113,10 +113,10 @@
AND tsrd.consumer_goods_name LIKE CONCAT('%',#{param.keyword},'%')
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tusr.create_time >= #{param.createStartTime}
+ AND Date(tusr.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tusr.create_time <= #{param.createEndTime}
+ AND Date(tusr.create_time) <= #{param.createEndTime}
</if>
ORDER BY tusr.create_time DESC
</select>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java
index bcf1351..e177a44 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java
@@ -19,4 +19,7 @@
@ApiModelProperty(value="商户名称")
private String shopName;
+ @ApiModelProperty(value="店长")
+ private String shopUser;
+
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
index 2e0359b..f84e752 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml
@@ -114,10 +114,10 @@
OR ts.shopowner_phone LIKE CONCAT('%',#{param.keyword},'%'))
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tsc.create_time >= #{param.createStartTime}
+ AND Date(tsc.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tsc.create_time <= #{param.createEndTime}
+ AND Date(tsc.create_time) <= #{param.createEndTime}
</if>
</select>
</mapper>
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 878200e..8e3df6c 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
@@ -325,10 +325,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.signStartTime!=null and param.signStartTime!=''">
- AND ts.sign_time >= #{param.signStartTime}
+ AND Date(ts.sign_time) >= #{param.signStartTime}
</if>
<if test="param.signEndTime!=null and param.signEndTime!=''">
- AND ts.sign_time <= #{param.signEndTime}
+ AND Date(ts.sign_time) <= #{param.signEndTime}
</if>
<if test="param.signProvinceCode!=null and param.signProvinceCode!=''">
AND ts.sign_province_code = #{param.signProvinceCode}
@@ -411,10 +411,10 @@
OR ts.shopowner_phone LIKE CONCAT('%',#{param.keyword},'%'))
</if>
<if test="param.startCooperDate!=null and param.startCooperDate!=''">
- AND ts.cooperation_start_time >= #{param.startCooperDate}
+ AND Date(ts.cooperation_start_time) >= #{param.startCooperDate}
</if>
<if test="param.endCooperDate!=null and param.endCooperDate!=''">
- AND ts.cooperation_end_time <= #{param.endCooperDate}
+ AND Date(ts.cooperation_end_time) <= #{param.endCooperDate}
</if>
ORDER BY ts.create_time
</select>
@@ -474,7 +474,8 @@
<select id="listMgtShopSimpleVo" resultType="com.ruoyi.shop.domain.vo.MgtShopListSimpleVo">
SELECT
shop_id,
- shop_name
+ shop_name,
+ shopowner_name shopUser
FROM t_shop
WHERE del_flag = 0
<if test="param.shopType!=null and param.shopType!=''">
@@ -591,10 +592,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
</select>
@@ -643,10 +644,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
GROUP BY ts.shop_type
</select>
@@ -673,10 +674,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
GROUP BY ts.shop_custom_status
</select>
@@ -703,10 +704,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
GROUP BY ts.shop_city_code
ORDER BY COUNT(ts.shop_id) DESC LIMIT 15
@@ -735,10 +736,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
ORDER BY tst.total_order_money DESC LIMIT 15
</select>
@@ -765,10 +766,10 @@
AND ts.shop_area_code = #{param.shopAreaCode}
</if>
<if test="param.startDate!=null and param.startDate!=''">
- AND ts.create_time >= #{param.startDate}
+ AND Date(ts.create_time) >= #{param.startDate}
</if>
<if test="param.endDate!=null and param.endDate!=''">
- AND ts.create_time <= #{param.endDate}
+ AND Date(ts.create_time) <= #{param.endDate}
</if>
GROUP BY ts.recommend_person
ORDER BY COUNT(ts.shop_id) DESC
@@ -795,10 +796,10 @@
AND ts.shop_type = #{param.shopType}
</if>
<if test="param.signStartTime!=null and param.signStartTime!=''">
- AND ts.sign_time >= #{param.signStartTime}
+ AND Date(ts.sign_time) >= #{param.signStartTime}
</if>
<if test="param.signEndTime!=null and param.signEndTime!=''">
- AND ts.sign_time <= #{param.signEndTime}
+ AND Date(ts.sign_time) <= #{param.signEndTime}
</if>
<if test="param.signProvinceCode!=null and param.signProvinceCode!=''">
AND ts.sign_province_code = #{param.signProvinceCode}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
index 1d746b4..d335032 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopSuggestMapper.xml
@@ -40,22 +40,22 @@
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 tss.replay_user_name LIKE CONCAT('%',#{param.keyword},'%'))
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tss.create_time >= #{param.createStartTime}
+ AND Date(tss.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tss.create_time <= #{param.createEndTime}
+ AND Date(tss.create_time) <= #{param.createEndTime}
</if>
<if test="param.suggestStatus!=null">
- AND tss.replay_flag = #{param.suggestStatus}
+ AND Date(tss.replay_flag) = #{param.suggestStatus}
</if>
<if test="param.tags!=null and param.tags!=''">
- AND tss.suggest_tags REGEXP #{param.tags}
+ AND Date(tss.suggest_tags) REGEXP #{param.tags}
</if>
<if test="param.replayStartTime!=null and param.replayStartTime!=''">
- AND tss.replay_time >= #{param.replayStartTime}
+ AND Date(tss.replay_time) >= #{param.replayStartTime}
</if>
<if test="param.replayEndTime!=null and param.replayEndTime!=''">
- AND tss.replay_time <= #{param.replayEndTime}
+ AND Date(tss.replay_time) <= #{param.replayEndTime}
</if>
</select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 4b312f5..e92c90a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.domain.dto.*;
@@ -92,6 +93,14 @@
public R<List<MgtActivenessListVo>> getActivenessList() {
List<MgtActivenessListVo> activenessList = activenessService.getActivenessList();
return R.ok(activenessList);
+ }
+
+ @RequestMapping(value = "/getCooperation", method = RequestMethod.POST)
+ @ApiOperation(value = "获取申请合作")
+ public R<MgtCooperationGetVo> getCooperation() {
+ Long userId = SecurityUtils.getUserId();
+ MgtCooperationGetVo cooperationGetVo = cooperationService.getCooperation();
+ return R.ok(cooperationGetVo);
}
@RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
@@ -441,7 +450,25 @@
@ApiOperation(value = "修改文章")
public R editArticle(@RequestBody MgtArticleEditDto mgtArticleEditDto) {
mgtArticleEditDto.setUserId(SecurityUtils.getUserId());
- articleService.editMgtArticle(mgtArticleEditDto);
+ Long oldClassId = articleService.editMgtArticle(mgtArticleEditDto);
+ // 创建MgtClassNumDto对象
+ MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+ if(mgtArticleEditDto.getArticleId()!=null){
+ // 如果类别ID不为空并且文章的类别ID不为空并且类别ID不同，则设置子类别ID和新增类别ID
+ if (mgtArticleEditDto.getClassId() != null && oldClassId != null
+ && !mgtArticleEditDto.getClassId().equals(oldClassId)) {
+ mgtClassNumDto.setSubClassId(oldClassId);
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+ }
+ // 如果类别ID不为空并且文章的类别ID为空，则设置新增类别ID
+ else if (mgtArticleEditDto.getClassId() != null && oldClassId == null) {
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+ }
+ }else{
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+ }
+ // 更新类别数量
+ sysClassificationService.changeClassNum(mgtClassNumDto);
return R.ok();
}
@@ -450,7 +477,12 @@
@ApiOperation(value = "删除文章")
public R deleteArticle(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
mgtBaseGetDto.setUserId(SecurityUtils.getUserId());
- articleService.deleteArticle(mgtBaseGetDto);
+ Long oldClassId = articleService.deleteArticle(mgtBaseGetDto);
+ if(oldClassId!=null){
+ MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+ mgtClassNumDto.setSubClassId(oldClassId);
+ sysClassificationService.changeClassNum(mgtClassNumDto);
+ }
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCooperationGetVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCooperationGetVo.java
new file mode 100644
index 0000000..6b835af
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCooperationGetVo.java
@@ -0,0 +1,25 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName MgtCooperationEditDto
+ * @Description TODO
+ * @Author jqs
+ * @Date 2023/6/6 9:18
+ * @Version 1.0
+ */
+@Data
+public class MgtCooperationGetVo{
+
+ @ApiModelProperty(value = "申请合作图片")
+ private String cooperationPicture;
+
+ @ApiModelProperty(value = "申请合作详情")
+ private String cooperationDetail;
+
+
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
index 01feed3..ec614d1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.system.domain.dto.MgtAllotRecommendDto;
import com.ruoyi.system.domain.dto.MgtAllotRecommendPageDto;
@@ -50,6 +51,7 @@
void allotRecommend(@Param("param")MgtAllotRecommendDto mgtAllotRecommendDto);
+
/**
* @description customTotal
* @param
@@ -57,14 +59,6 @@
* @author jqs34
* @date 2023/6/18 16:54
*/
- Integer customTotal();
+ MgtBulletinBoardVo customTotal();
- /**
- * @description customToday
- * @param
- * @return Integer
- * @author jqs34
- * @date 2023/6/18 16:54
- */
- Integer customToday();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java
index a5adeaa..5e4cf21 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java
@@ -49,7 +49,7 @@
* @param mgtArticleEditDto
* @return void
*/
- void editMgtArticle(MgtArticleEditDto mgtArticleEditDto);
+ Long editMgtArticle(MgtArticleEditDto mgtArticleEditDto);
/**
* @description 删除文章
@@ -58,7 +58,7 @@
* @param mgtBaseGetDto
* @return void
*/
- void deleteArticle(MgtBaseGetDto mgtBaseGetDto);
+ Long deleteArticle(MgtBaseGetDto mgtBaseGetDto);
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java
index 29de0c8..1085c74 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java
@@ -1,8 +1,9 @@
package com.ruoyi.system.service.config;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.pojo.config.Cooperation;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.vo.MgtCooperationGetVo;
/**
* <p>
@@ -22,4 +23,13 @@
* @return void
*/
void editCooperation(MgtCooperationEditDto mgtCooperationEditDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/21 21:34
+ * @param
+ * @return MgtCooperationGetVo
+ */
+ MgtCooperationGetVo getCooperation();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
index 464c996..5534863 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
@@ -64,4 +64,7 @@
* @date 2023/6/18 16:47
*/
MgtBulletinBoardVo boardMemberTotal();
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
index 2d95f6e..e77d48a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
import com.ruoyi.system.domain.dto.MgtArticleEditDto;
import com.ruoyi.system.domain.dto.MgtArticlePageDto;
import com.ruoyi.system.domain.pojo.config.Article;
@@ -18,7 +17,6 @@
import com.ruoyi.system.domain.vo.MgtArticlePageVo;
import com.ruoyi.system.mapper.config.ArticleMapper;
import com.ruoyi.system.service.config.ArticleService;
-import com.ruoyi.system.service.config.SysClassificationService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -41,8 +39,6 @@
@Resource
private ArticleMapper articleMapper;
- @Resource
- private SysClassificationService sysClassificationService;
/**
* @description 删除文章分类
@@ -77,11 +73,10 @@
* @return void
*/
@Override
- public void editMgtArticle(MgtArticleEditDto mgtArticleEditDto){
- // 创建MgtClassNumDto对象
- MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+ public Long editMgtArticle(MgtArticleEditDto mgtArticleEditDto){
// 创建Article对象
Article article;
+ Long oldClassId = null;
// 根据文章标题查询文章是否存在
Article articleSame = this.getOne(new LambdaQueryWrapper<Article>()
.eq(Article::getDelFlag, 0)
@@ -94,16 +89,7 @@
}
// 根据文章ID获取文章对象
article = this.getById(mgtArticleEditDto.getArticleId());
- // 如果类别ID不为空并且文章的类别ID不为空并且类别ID不同，则设置子类别ID和新增类别ID
- if (mgtArticleEditDto.getClassId() != null && article.getClassId() != null
- && !mgtArticleEditDto.getClassId().equals(article.getClassId())) {
- mgtClassNumDto.setSubClassId(article.getClassId());
- mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
- }
- // 如果类别ID不为空并且文章的类别ID为空，则设置新增类别ID
- else if (mgtArticleEditDto.getClassId() != null && article.getClassId() == null) {
- mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
- }
+ oldClassId = article.getClassId();
}
// 如果文章ID为空
else {
@@ -116,7 +102,6 @@
article.setDelFlag(0);
article.setCreateTime(new Date());
article.setCreateUserId(mgtArticleEditDto.getUserId());
- mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
}
// 设置文章的类别ID、排序、标题、简介、封面、视频、更新时间和更新用户ID
article.setClassId(mgtArticleEditDto.getClassId());
@@ -136,8 +121,7 @@
}
// 保存或更新文章
this.saveOrUpdate(article);
- // 更新类别数量
- sysClassificationService.changeClassNum(mgtClassNumDto);
+ return oldClassId;
}
@@ -149,18 +133,13 @@
* @return void
*/
@Override
- public void deleteArticle(MgtBaseGetDto mgtBaseGetDto){
+ public Long deleteArticle(MgtBaseGetDto mgtBaseGetDto){
Article article = this.getById(Long.valueOf(mgtBaseGetDto.getId()));
article.setDelFlag(1);
article.setUpdateTime(new Date());
article.setUpdateUserId(mgtBaseGetDto.getUserId());
this.saveOrUpdate(article);
- if(article.getClassId()!=null){
- MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
- mgtClassNumDto.setSubClassId(article.getClassId());
- sysClassificationService.changeClassNum(mgtClassNumDto);
- }
-
+ return article.getClassId();
}
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java
index 3230888..d850c0f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.service.impl.config;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.pojo.config.Cooperation;
+import com.ruoyi.system.domain.vo.MgtCooperationGetVo;
import com.ruoyi.system.mapper.config.CooperationMapper;
import com.ruoyi.system.service.config.CooperationService;
import org.springframework.stereotype.Service;
@@ -56,5 +58,21 @@
this.saveOrUpdate(cooperation);
}
-
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/21 21:32
+ * @param
+ * @return MgtCooperationGetVo
+ */
+ @Override
+ public MgtCooperationGetVo getCooperation(){
+ LambdaQueryWrapper<Cooperation> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Cooperation::getDelFlag,0);
+ Cooperation cooperation = this.getOne(queryWrapper,false);
+ MgtCooperationGetVo cooperationGetVo = new MgtCooperationGetVo();
+ cooperationGetVo.setCooperationPicture(cooperation.getTopPicture());
+ cooperationGetVo.setCooperationDetail(cooperation.getCooperDetail());
+ return cooperationGetVo;
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
index cd15e89..202703d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
@@ -594,13 +594,13 @@
MgtBulletinBoardVo mgtBulletinBoardVoCustom = recommendCooperationService.boardMemberTotal();
mgtBulletinBoardVo.setCustomTotal(mgtBulletinBoardVoCustom.getCustomTotal());
mgtBulletinBoardVo.setCustomToday(mgtBulletinBoardVoCustom.getCustomToday());
+ mgtBulletinBoardVo.setFollowUserToday(mgtBulletinBoardVoCustom.getFollowUserToday());
// 获取店铺信息
MgtBulletinBoardVo mgtBulletinBoardVoShop = remoteShopService.boardShopTotal().getData();
mgtBulletinBoardVo.setShopTotal(mgtBulletinBoardVoShop.getShopTotal());
mgtBulletinBoardVo.setAgencyTotal(mgtBulletinBoardVoShop.getAgencyTotal());
mgtBulletinBoardVo.setDealerTotal(mgtBulletinBoardVoShop.getDealerTotal());
mgtBulletinBoardVo.setFollowShopToday(mgtBulletinBoardVoShop.getFollowShopToday());
- mgtBulletinBoardVo.setFollowUserToday(0);
// 获取订单信息
MgtBulletinBoardVo mgtBulletinBoardVoOrder = remoteOrderService.boardOrderTotal().getData();
mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
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 a590b14..703ee14 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
@@ -107,9 +107,7 @@
*/
@Override
public MgtBulletinBoardVo boardMemberTotal(){
- MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- mgtBulletinBoardVo.setCustomToday(recommendCooperationMapper.customToday());
- mgtBulletinBoardVo.setCustomTotal(recommendCooperationMapper.customTotal());
+ MgtBulletinBoardVo mgtBulletinBoardVo = recommendCooperationMapper.customTotal();
return mgtBulletinBoardVo;
}
}
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 ecdaf0e..0ac4ccd 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
@@ -16,7 +16,6 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo;
import com.ruoyi.system.domain.dto.UserMenuEditDto;
-import com.ruoyi.system.domain.pojo.staff.SysStaff;
import com.ruoyi.system.domain.pojo.sys.SysPost;
import com.ruoyi.system.domain.pojo.sys.SysUserMenu;
import com.ruoyi.system.domain.pojo.sys.SysUserPost;
@@ -719,7 +718,9 @@
@Override
public void frozenUser(Long userId){
SysUser sysUser = this.selectUserById(userId);
+
sysUser.setStatus("1");
+
userMapper.updateUser(sysUser);
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml
index 97066fa..47b0850 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml
@@ -22,10 +22,10 @@
AND ta.article_title LIKE CONCAT('%',#{param.articleTitle},'%')
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND ta.create_time >= #{param.createStartTime}
+ AND Date(ta.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND ta.create_time <= #{param.createEndTime}
+ AND Date(ta.create_time) <= #{param.createEndTime}
</if>
ORDER BY ta.create_time DESC
</select>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
index 93bacf5..77edfcc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
@@ -35,10 +35,10 @@
AND FIND_IN_SET(#{param.memberSource},trc.member_source) > 0
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND trc.create_time >= #{param.createStartTime}
+ AND Date(trc.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND trc.create_time <= #{param.createEndTime}
+ AND Date(trc.create_time) <= #{param.createEndTime}
</if>
ORDER BY trc.create_time DESC
</select>
@@ -47,11 +47,15 @@
UPDATE t_recommend_cooperation set allot_user_id = #{param.allotUserId} WHERE del_flag = 0 AND FIND_IN_SET(id, #{param.recommendIds}) > 0
</update>
- <select id="customTotal" resultType="java.lang.Integer">
- SELECT COUNT(id) FROM t_recommend_cooperation WHERE del_flag = 0
+ <select id="customTotal" resultType="com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo">
+ SELECT
+ COUNT(id) AS customTotal,
+ COUNT(CASE WHEN Date(create_time) = CURDATE() THEN id END) AS customToday,
+ COUNT(CASE WHEN Date(create_time) = CURDATE() AND allot_user_id IS NULL THEN id END) AS followUserToday
+ FROM
+ t_recommend_cooperation
+ WHERE
+ del_flag = 0;
</select>
- <select id="customToday" resultType="java.lang.Integer">
- SELECT COUNT(id) FROM t_recommend_cooperation WHERE del_flag = 0 AND create_time = CURDATE()
- </select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml
index d49d180..3b3f724 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml
@@ -34,10 +34,10 @@
AND su.dept_id = #{param.deptId}
</if>
<if test="param.createStartTime!=null and param.createStartTime!=''">
- AND tss.create_time >= #{param.createStartTime}
+ AND Date(tss.create_time) >= #{param.createStartTime}
</if>
<if test="param.createEndTime!=null and param.createEndTime!=''">
- AND tss.create_time <= #{param.createEndTime}
+ AND Date(tss.create_time) <= #{param.createEndTime}
</if>
<if test="param.suggestStatus!=null">
AND tss.replay_flag = #{param.suggestStatus}
@@ -46,10 +46,10 @@
AND tss.suggest_tags REGEXP #{param.tags}
</if>
<if test="param.replayStartTime!=null and param.replayStartTime!=''">
- AND tss.replay_time >= #{param.replayStartTime}
+ AND Date(tss.replay_time) >= #{param.replayStartTime}
</if>
<if test="param.replayEndTime!=null and param.replayEndTime!=''">
- AND tss.replay_time <= #{param.replayEndTime}
+ AND Date(tss.replay_time) <= #{param.replayEndTime}
</if>
</select>
--
Gitblit v1.7.1