From 48c9592f2dfa35c91c0204e307b21e9f8d104507 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 19 八月 2024 17:46:01 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitChangeDto.java | 10 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java | 5
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java | 8 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 16 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 19 +-
ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 45 ++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 2
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java | 2
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 26 ++-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TAppUserDto.java | 118 +++++++++++++++++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java | 3
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java | 12 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java | 1
/dev/null | 21 ---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 1
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 19 +++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TSystemConfigurationController.java | 6
27 files changed, 268 insertions(+), 70 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java
index 2a7c132..c21ca03 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java
@@ -10,5 +10,5 @@
@ApiModelProperty("1月2季3年")
private Integer type;
@ApiModelProperty("用户Id")
- private Long userId;
+ private String userIds;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java
index 09ba2f5..90326db 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java
@@ -7,6 +7,7 @@
@Data
public class PointsQueryDto extends BasePage {
+ @ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("1收入0支出")
private Integer type;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TAppUserDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TAppUserDto.java
new file mode 100644
index 0000000..a16200e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TAppUserDto.java
@@ -0,0 +1,118 @@
+package com.ruoyi.account.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user")
+@ApiModel(value="TAppUser对象", description="")
+public class TAppUserDto extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private String id;
+
+ @ApiModelProperty(value = "用户")
+ @TableField("name")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "头像")
+ @TableField("avatar")
+ private String avatar;
+
+ @ApiModelProperty(value = "会员id")
+ @TableField("vip_id")
+ private Integer vipId;
+
+ @ApiModelProperty(value = "会员到期时间")
+ @TableField("vip_end_time")
+ private LocalDateTime vipEndTime;
+
+ @ApiModelProperty(value = "单位id")
+ @TableField("company_id")
+ private Integer companyId;
+
+ @ApiModelProperty(value = "身份证号")
+ @TableField("id_card")
+ private String idCard;
+
+ @ApiModelProperty(value = "认证状态（0=否，1=是）")
+ @TableField("auth_status")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "微信openid")
+ @TableField("wx_openid")
+ private String wxOpenid;
+
+ @ApiModelProperty(value = "支付宝openid")
+ @TableField("ali_openid")
+ private String aliOpenid;
+
+ @ApiModelProperty(value = "积分")
+ @TableField("points")
+ private Integer points;
+
+ @ApiModelProperty(value = "省名称")
+ @TableField("province")
+ private String province;
+
+ @ApiModelProperty(value = "省区划代码")
+ @TableField("province_code")
+ private String provinceCode;
+
+ @ApiModelProperty(value = "市名称")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty(value = "市区划代码")
+ @TableField("city_code")
+ private String cityCode;
+
+ @ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
+ @TableField("status")
+ private Integer status;
+
+
+
+ @ApiModelProperty(value = "最后一次登录时间")
+ @TableField("last_login_time")
+ private LocalDateTime lastLoginTime;
+
+
+
+
+ @ApiModelProperty(value = "标签名称")
+ @TableField(exist = false)
+ private String tagName;
+ @ApiModelProperty(value = "vip名称")
+ @TableField(exist = false)
+ private String vipName;
+ @ApiModelProperty("累计充电数")
+ @TableField(exist = false)
+ private Long orderCount;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitChangeDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitChangeDto.java
new file mode 100644
index 0000000..5fe9319
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitChangeDto.java
@@ -0,0 +1,10 @@
+package com.ruoyi.account.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UnitChangeDto {
+ private String ids;
+ private Integer unitId;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
index decb469..4ddbf88 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -32,6 +32,8 @@
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "用户")
@TableField("name")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
index 154cd93..1a43603 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_system_configuration")
@ApiModel(value="TSystemConfiguration对象", description="")
-public class TSystemConfiguration extends BasePojo {
+public class TSystemConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
index 1032e02..9449897 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
@@ -39,8 +39,8 @@
private Integer standardCondition;
@ApiModelProperty(value = "达标条件值JSON（{\"day\":1,\"times\":5}）")
- @TableField("condition")
- private String condition;
+ @TableField("conditions")
+ private String conditions;
@@ -49,6 +49,10 @@
@TableField(exist = false)
private Long count;
+ @ApiModelProperty(value = "前端展示用")
+ @TableField("type")
+ private Integer type;
+
}
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
index 6c20c07..d0ca0ac 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
@@ -31,7 +31,7 @@
/**
* 这里为支持的请求头，如果有自定义的header字段请自己添加
*/
- private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client, request-origion, sign, nonce_str";
+ private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, username, client, request-origion, sign, nonce_str, timestamp";
private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
private static final String ALLOWED_ORIGIN = "*";
private static final String ALLOWED_EXPOSE = "*";
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
index 7ea17ff..6a0fb93 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/SignFilter.java
@@ -1,6 +1,7 @@
package com.ruoyi.gateway.filter;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.HttpStatus;
@@ -46,13 +47,6 @@
@Component
public class SignFilter implements GlobalFilter, Ordered {
private static final Logger log = LoggerFactory.getLogger(SignFilter.class);
-
- // 排除过滤的 uri 地址，nacos自行添加
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
-
- @Autowired
- private RedisService redisService;
@Value("${security.sign}")
private boolean parameter_signature;
@@ -156,6 +150,10 @@
// 构造签名键值对的格式
StringBuilder sb = new StringBuilder();
for (String k : keySet) {
+ Object o = params.get(k);
+ if(o instanceof JSONObject || o instanceof JSONArray){
+ continue;
+ }
String v = params.getString(k);
if(StringUtils.isNotEmpty(v)){
sb.append(k + "=" + v + "&");
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 9e2e0b3..a313113 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -130,7 +130,7 @@
@ApiOperation(value = "单位下拉框", tags = {"用户管理-单位管理"})
- @PostMapping(value = "/unit/select")
+ @GetMapping(value = "/unit/select")
public R<List<TCompany>> unitSelect() {
UnitListQueryDto unitListQueryDto = new UnitListQueryDto();
unitListQueryDto.setPageCurr(1);
@@ -193,16 +193,19 @@
for (TAppUser appUser : page.getRecords()) {
//拿到最新的tagId
TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
- //设置最新的tagName
- R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
- if (byIdTag.getData()!=null) {
- appUser.setTagName(byIdTag.getData().getName());
+ if (one!=null) {
+ //设置最新的tagName
+ R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
+ if (byIdTag.getData() != null) {
+ appUser.setTagName(byIdTag.getData().getName());
+ }
}
//匹配vipMap的值
appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
//累计充电次数
R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
appUser.setOrderCount(useOrderCount.getData());
+ appUser.setUid(appUser.getId().toString());
}
return R.ok(page);
@@ -294,7 +297,7 @@
}
@ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"})
- @PostMapping(value = "/user/detail/{id}")
+ @GetMapping(value = "/user/detail/{id}")
public R<UserDetailDto> userDetail(@PathVariable Long id) {
TAppUser user = appUserService.getById(id);
UserDetailDto userDetailDto = new UserDetailDto();
@@ -364,6 +367,28 @@
return R.ok();
}
+ @ApiOperation(value = "修改单位", tags = {"后台-用户管理-用户列表"})
+ @PostMapping(value = "/user/unit/change")
+ public R unitChange(@RequestBody UnitChangeDto unitChangeDto) {
+ for (String s : unitChangeDto.getIds().split(",")) {
+ TAppUser byId = appUserService.getById(s);
+ byId.setCompanyId(unitChangeDto.getUnitId());
+ appUserService.updateById(byId);
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "删除用户", tags = {"后台-用户管理-用户列表"})
+ @DeleteMapping(value = "/user/delete")
+ public R userDelete(String ids) {
+ String[] split = ids.split(",");
+ for (String s : split) {
+ appUserService.removeById(s);
+ }
+ return R.ok();
+
+ }
+
@ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
@PostMapping(value = "/user/info")
public R<AppUserInfoDto> info() {
@@ -418,7 +443,11 @@
@ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
@PostMapping(value = "/user/give/vip")
public R giveVip(@RequestBody GiveVipDto giveVipDto) {
- TAppUser nowUser = appUserService.getById(giveVipDto.getUserId());
+ String[] split = giveVipDto.getUserIds().split(",");
+ for (String s : split) {
+
+
+ TAppUser nowUser = appUserService.getById(s);
int plusDay = 0;
if (giveVipDto.getType() == 1) {
@@ -434,7 +463,7 @@
appUserService.updateById(nowUser);
//执行一次赠送优惠卷的定时任务
-
+ }
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index c39f5a1..872fa64 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -56,7 +56,7 @@
@ApiOperation(value = "标签删除", tags = {"用户管理-用户标签管理"})
@DeleteMapping(value = "/tags/delete")
- public R delete(@PathVariable String ids) {
+ public R delete(String ids) {
//拿到单位列表
String[] split = ids.split(",");
for (String id : split) {
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
index b477141..a20ac1c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/GiveVipUtil.java
@@ -42,7 +42,7 @@
tAppUserVipDetail.setEndTime(LocalDateTime.now().plusMonths(plusDay).minusDays(1));
tAppUserVipDetail.setVipId(vipId);
- R<TVip> info = vipClient.getInfo(vipId);
+ R<TVip> info = vipClient.getInfo1(vipId);
TVip vip = info.getData();
List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/config/DataSourceProxyConfig.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/config/DataSourceProxyConfig.java
deleted file mode 100644
index 5749262..0000000
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/config/DataSourceProxyConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//package com.ruoyi.other.config;
-//
-//import io.seata.rm.datasource.DataSourceProxy;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.sql.DataSource;
-//
-///**
-// * @author zhibing.pu
-// * @date 2024/8/17 11:10
-// */
-//@Configuration
-//public class DataSourceProxyConfig {
-//
-//
-// @Bean
-// public DataSource dataSource(DataSource druidDataSource){
-// return new DataSourceProxy(druidDataSource);
-// }
-//}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
index 140d0d7..84e3376 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
@@ -50,6 +50,7 @@
return AjaxResult.ok(activityService.getById(id));
}
@ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询")
+
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
return AjaxResult.ok(activityService.pageList(dto));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
index 43d551d..cf3a218 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java
@@ -32,6 +32,9 @@
public class TActivityStatisticsController {
@Autowired
private OrderClient orderClient;
+
+
+
@ApiOperation(tags = {"管理后台-活动费用统计"},value = "管理后台活动费用统计")
@PostMapping(value = "/pageList")
public AjaxResult<TActivityVO> pageList(@RequestBody TActivityStatisticsQuery query) {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
index 8bfd455..c5efd84 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -57,6 +57,9 @@
public AjaxResult<TAdvertising> getInfo(Integer id) {
return AjaxResult.ok(advertisingService.getById(id));
}
+
+
+
@ApiOperation(tags = {"管理后台-广告管理"},value = "广告列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TAdvertising>> pageList(@RequestBody AdvertisingDTO dto) {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index eede80e..4dc48ac 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -45,24 +45,35 @@
@Autowired
private AppCouponClient appCouponClient;
+
+
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券添加")
public AjaxResult saveActivity(@RequestBody TCoupon dto) {
tCouponService.save(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券删除")
public AjaxResult delete(Integer id) {
tCouponService.removeById(id);
return AjaxResult.success();
}
+
+
+
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券修改")
public AjaxResult updateActivity(@RequestBody TCoupon dto) {
tCouponService.updateById(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情")
public AjaxResult<TCoupon> getInfo(Integer id) {
@@ -73,6 +84,9 @@
byId.setUseCount(appCouponClient.getUseCountByCouponId(id).getData());
return AjaxResult.ok(byId);
}
+
+
+
@PostMapping("/exchangeRecord")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
@@ -93,6 +107,9 @@
}
return AjaxResult.ok(data);
}
+
+
+
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "发放优惠券")
@GetMapping(value = "/grantCoupon")
public AjaxResult grantCoupon(@RequestBody GrantCouponDto dto) {
@@ -111,6 +128,8 @@
return AjaxResult.success();
}
+
+
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TCoupon>> pageList(@RequestBody CouponQuery dto) {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
index 113df1d..f612c11 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
@@ -48,6 +48,8 @@
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
+
+
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
@PostMapping(value = "/page")
public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index bea875b..29dd21b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -30,29 +30,45 @@
private TGoodsService goodsService;
@Autowired
private TActivityService activityService;
+
+
+
+
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
public AjaxResult saveActivity(@RequestBody TGoods dto) {
goodsService.save(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
public AjaxResult delete(Integer id) {
goodsService.removeById(id);
return AjaxResult.success();
}
+
+
+
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
public AjaxResult updateActivity(@RequestBody TGoods dto) {
goodsService.updateById(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/getInfo")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品查看详情")
public AjaxResult<TGoods> getInfo(Integer id) {
return AjaxResult.ok(goodsService.getById(id));
}
+
+
+
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TGoods>> pageList(@RequestBody GoodsDTO dto) {
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
index 46b995a..35e15af 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
@@ -23,6 +23,9 @@
public class THtmlController {
@Resource
private THtmlService htmlService;
+
+
+
@ApiOperation(tags = {"后台-内容设置-协议服务"},value = "新增修改")
@PostMapping(value = "/saveOrUpdate")
public AjaxResult saveOrUpdate(@RequestBody THtml tHtml) {
@@ -31,7 +34,7 @@
}
@ApiOperation(tags = {"后台-内容设置-协议服务"},value = "查询")
- @PostMapping(value = "/selectByType/{type}")
+ @GetMapping(value = "/selectByType/{type}")
public AjaxResult selectByType(@PathVariable Integer type) {
THtml one = htmlService.lambdaQuery().eq(THtml::getType, type).last("limit 1").one();
return AjaxResult.success(one);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
index b19e461..5027933 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
@@ -67,6 +67,9 @@
}
return R.ok(g.getContent());
}
+
+
+
@GetMapping("/saveInfo")
@ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
index 9eacc23..9499809 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TInvoiceTypeController.java
@@ -67,7 +67,7 @@
@ResponseBody
@DeleteMapping("/delInvoiceType")
@ApiOperation(value = "删除发票类型", tags = {"管理后台-发票类型管理"})
- public AjaxResult<TInvoiceType> delInvoiceType(@RequestParam("id") Integer[] id){
+ public AjaxResult<TInvoiceType> delInvoiceType(Integer[] id){
List<TInvoiceType> tInvoiceTypes = invoiceTypeService.listByIds(Arrays.asList(id));
for (TInvoiceType invoiceType : tInvoiceTypes) {
invoiceTypeService.removeById(invoiceType);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
index 06838a6..fdadabc 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
@@ -35,15 +35,27 @@
}
@ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除")
- @PostMapping(value = "/deleteById/{id}")
- public AjaxResult deleteById(@PathVariable Integer id) {
- noticeService.removeById(id);
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult deleteById(String ids) {
+ String[] split = ids.split(",");
+ for (String id : split) {
+ noticeService.removeById(id);
+ }
+
return AjaxResult.success();
}
@ApiOperation(tags = {"后台-内容设置-公告管理"},value = "查询")
@PostMapping(value = "/pageList")
public AjaxResult<Page<TNotice>> authPageList(@RequestBody NoticeQueryDto query) {
+ if (query.getStatus()==null){
+
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+
+ }
+
if (query.getStatus()==0){
return AjaxResult.success(noticeService.lambdaQuery()
.le(TNotice::getStartTime, LocalDateTime.now())
@@ -59,12 +71,8 @@
.ge(TNotice::getEndTime, LocalDateTime.now())
.like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
.page(Page.of(query.getPageCurr(),query.getPageSize())));
- }else{
- return AjaxResult.success(noticeService.lambdaQuery()
- .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
- .page(Page.of(query.getPageCurr(),query.getPageSize())));
- }
-
+ }
+ return AjaxResult.success();
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TSystemConfigurationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TSystemConfigurationController.java
index f63f4a5..6b2b408 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TSystemConfigurationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TSystemConfigurationController.java
@@ -34,13 +34,15 @@
*/
@ApiOperation(tags = {"小程序-系统设置","后台-内容设置"},value = "联系客服，查询设置")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TSystemConfiguration> getDetailById(@RequestParam(name = "type")@ApiParam(value = "1=客服信息，2=系统设置") Integer type) {
+ public AjaxResult<TSystemConfiguration> getDetailById(@RequestParam("type")@ApiParam(value = "1=客服信息，2=系统设置") Integer type) {
return AjaxResult.ok(systemConfigurationService.getOne(Wrappers.lambdaQuery(TSystemConfiguration.class)
.eq(TSystemConfiguration::getType, type)));
}
+
+
@ApiOperation(tags = {"后台-内容设置"},value = "客户信息,系统内容设置")
- @GetMapping(value = "/save")
+ @PostMapping(value = "/save")
public AjaxResult getDetailById(@RequestBody TSystemConfiguration systemConfiguration) {
systemConfigurationService.saveOrUpdate(systemConfiguration);
return AjaxResult.success();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index a460fb0..b02586b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TIntegralRule;
@@ -84,22 +85,18 @@
public R<TVip> getInfo1(@RequestParam("id")Integer id) {
return R.ok(vipService.getById(id));
}
+
+
+
+
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员列表分页查询")
@PostMapping(value = "/pageList")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
- @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
- })
- public AjaxResult<PageInfo<TVip>> pageList(Integer pageCurr,Integer pageSize) {
- return AjaxResult.ok(vipService.pageList(pageCurr,pageSize));
+ public AjaxResult<PageInfo<TVip>> pageList(@RequestBody BasePage basePage) {
+ return AjaxResult.ok(vipService.pageList(basePage.getPageCurr(), basePage.getPageSize()));
}
@ApiOperation(tags = {"会员下拉框"},value = "会员列表分页查询")
- @PostMapping(value = "/select")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
- @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
- })
+ @GetMapping(value = "/select")
public AjaxResult<List<TVip>> select() {
return AjaxResult.ok(vipService.list());
}
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index 0976d0b..887402d 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -42,7 +42,7 @@
enabled: true
application-id: ${spring.application.name}
tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
- enable-auto-data-source-proxy: true #关闭数据库代理
+ enable-auto-data-source-proxy: false #关闭数据库代理
service:
vgroup-mapping:
seata_tx_group: default
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml
index 16399de..7ce0890 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TUserTagMapper.xml
@@ -7,14 +7,14 @@
<id column="id" property="id" />
<result column="name" property="name" />
<result column="standard_condition" property="standardCondition" />
- <result column="condition" property="condition" />
+ <result column="conditions" property="conditions" />
<result column="create_time" property="createTime" />
<result column="del_flag" property="delFlag" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, name, standard_condition, condition, create_time, del_flag
+ id, name, standard_condition, conditions, create_time, del_flag
</sql>
</mapper>
--
Gitblit v1.7.1