From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java | 24 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java | 27 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml | 21 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java | 28 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java | 15 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java | 14 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java | 25 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml | 13 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml | 18 +-
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java | 1
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java | 32 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml | 15 ++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java | 38 +++++
30 files changed, 298 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
index 81df0a7..665b19a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderBargainVo;
@@ -48,7 +49,10 @@
@ApiOperation(value = "分页查询活动列表",response = ComBatteryCommodityActivityVo.class)
@PostMapping("/page")
public R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
- comBatteryCommodityActivity.setStatus(1);
+ comBatteryCommodityActivity.setIsApplets(1);
+ if(comBatteryCommodityActivity.getIsUser().equals(1)){
+ comBatteryCommodityActivity.setUserId(this.getUserId());
+ }
return this.comBatteryCommodityActivityService.queryByPage(comBatteryCommodityActivity);
}
@@ -63,7 +67,12 @@
@ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
@GetMapping("/detail")
public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.comBatteryCommodityActivityService.detailById(id,userId);
}
/**
@@ -77,7 +86,7 @@
@ApiOperation(value = "查询活动列表",response = ComBatteryCommodityActivityVo.class)
@PostMapping("/list")
public R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
- comBatteryCommodityActivity.setStatus(1);
+ comBatteryCommodityActivity.setIsApplets(1);
return this.comBatteryCommodityActivityService.queryByList(comBatteryCommodityActivity);
}
@@ -85,13 +94,22 @@
@PostMapping("/assorted/dough")
public R queryByAssortedDoughList(@RequestBody PageComBatteryCommodityOrderCollageTeamDto orderCollageTeamDto) {
orderCollageTeamDto.setStatus(1);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ orderCollageTeamDto.setUserId(loginUserInfo.getUserId());
+ }
return this.orderCollageTeamService.queryByPage(orderCollageTeamDto);
}
@ApiOperation(value = "查询拼团团队详情",response = ComBatteryCommodityOrderCollageTeamVo.class)
- @PostMapping("/assorted/dough/detail")
+ @GetMapping("/assorted/dough/detail")
public R queryByAssortedDoughDetail(@RequestParam("id") Long id) {
- return this.orderCollageTeamService.detailById(id);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.orderCollageTeamService.detailById(id,userId);
}
/**
@@ -102,6 +120,7 @@
@ApiOperation(value = "创建拼团订单")
@PostMapping("/start/fight")
public R startFight(@RequestBody StartFightOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
return this.comBatteryCommodityActivityService.startFight(orderDto);
}
@@ -113,6 +132,7 @@
@ApiOperation(value = "创建砍价订单")
@PostMapping("/start/bargain")
public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
return this.comBatteryCommodityActivityService.startBargain(orderDto);
}
@@ -124,6 +144,7 @@
@ApiOperation(value = "帮好友砍价")
@PostMapping("/start/user/bargain")
public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
return this.comBatteryCommodityActivityService.startUserBargain(orderDto);
}
@@ -146,6 +167,7 @@
@ApiOperation(value = "创建秒杀订单")
@PostMapping("/start/seckill")
public R startSeckill(@RequestBody StartSeckillOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
return this.comBatteryCommodityActivityService.startSeckill(orderDto);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java
index c66bf0e..43762c7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java
@@ -46,6 +46,7 @@
@PostMapping("/page")
public R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
comBatteryCommodityOrder.setUserId(this.getUserId());
+ comBatteryCommodityOrder.setIsApplets(1);
return this.comBatteryCommodityOrderService.queryByPage(comBatteryCommodityOrder);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java
index ab7d539..c841551 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java
@@ -73,7 +73,7 @@
@ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
@GetMapping("/detail")
public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ return this.comBatteryCommodityActivityService.detailById(id,0L);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java
index acd8b6b..0c173c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java
@@ -129,5 +129,14 @@
@ApiModelProperty(value = "关键词")
private String keyWord;
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "是否是查询自己参与的活动(1.是 2.否)")
+ private Integer isUser = 2;
+
+ @ApiModelProperty(value = "是否是小程序(1.是 2.否)")
+ private Integer isApplets;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java
index 9d5bae8..b73ed73 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java
@@ -202,5 +202,8 @@
@ApiModelProperty(value = "下单时间结束查询")
private String endTime;
+ @ApiModelProperty(value = "是否是小程序查询(1.是 2.否)")
+ private Integer isApplets;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java
new file mode 100644
index 0000000..fcbd782
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class ComBatteryActivityTeamVo {
+
+ @ApiModelProperty(value = "是否可以开团（1.是 2.否）")
+ private Integer isOpen = 1;
+
+ @ApiModelProperty(value = "团队id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "拼团结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date teamEndTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
index 4a255ef..f954386 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -136,5 +137,30 @@
private Long specsId;
@ApiModelProperty(value = "商户规格名称")
- private Long specsName;
+ private String specsName;
+
+ @ApiModelProperty(value = "活动已卖出数量")
+ private Integer commoditySaleNum;
+
+ @ApiModelProperty(value = "是否可以开团（1.是 2.否）")
+ private Integer isOpen = 1;
+
+ @ApiModelProperty(value = "团队id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "拼团结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date teamEndTime;
+
+ @ApiModelProperty(value = "是否可以砍价（1.是 2.否）")
+ private Integer isBargain = 1;
+
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+
+ @ApiModelProperty(value = "砍价结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date bargainEndTime;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
index df80270..9f23b47 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
@@ -89,4 +89,19 @@
@ApiModelProperty(value = "好友帮砍价记录列表")
private List<ComBatteryCommodityOrderBargainRecordVo> orderBargainRecordList;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品图片")
+ private String commodityImages;
+
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
index 8da3286..c492183 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
@@ -75,4 +75,7 @@
@ApiModelProperty(value = "拼团人员列表")
private List<ComBatteryCommodityOrderCollageTeamPeopleVo> orderCollageTeamPeopleList;
+
+ @ApiModelProperty(value = "是否可以参与（1.是 2.否）")
+ private Integer isPartake = 1;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
index 98f1b0d..c209ae4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
@@ -225,4 +225,7 @@
@ApiModelProperty(value = "收货地区编码")
private String receivingRegionCode;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
index 89146e8..8e48190 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
@@ -72,7 +72,7 @@
* @date 2022-03-29 13:17:41
*/
@GetMapping("/detail")
- R detailById(@RequestParam("id") Long id);
+ R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
/**
* description queryByList 查询列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java
index 1d88de6..df41692 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java
@@ -72,7 +72,7 @@
* @date 2022-03-29 16:07:00
*/
@GetMapping("/detail")
- R detailById(@RequestParam("id") Long id);
+ R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
/**
* description queryByList 查询列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java
index 1fca5f6..e51f801 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java
@@ -79,6 +79,9 @@
public R edit(@RequestBody EditComBatteryCommodityActivityDto comBatteryCommodityActivity) {
comBatteryCommodityActivity.setUpdateAt(new Date());
comBatteryCommodityActivity.setUpdateBy(this.getUserId());
+ if(comBatteryCommodityActivity.getStatus() == null){
+ comBatteryCommodityActivity.setStatus(1);
+ }
return this.comBatteryCommodityActivityService.update(comBatteryCommodityActivity);
}
@@ -107,7 +110,7 @@
@ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
@GetMapping("/detail")
public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ return this.comBatteryCommodityActivityService.detailById(id,0L);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
index 70fb3d1..70e5aea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
@@ -94,8 +94,8 @@
* @date 2022-03-29 13:17:38
*/
@GetMapping("/detail")
- public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
+ return this.comBatteryCommodityActivityService.detailById(id,userId);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
index 49e5542..f35c531 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
@@ -85,8 +85,8 @@
* @date 2022-03-29 16:06:55
*/
@GetMapping("/detail")
- public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityOrderCollageTeamService.detailById(id);
+ public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
+ return this.comBatteryCommodityOrderCollageTeamService.detailById(id,userId);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java
index b081fff..1cb5107 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
+import java.util.Map;
/**
* title: 电动车商城-拼团订单团队表表数据库访问层
@@ -54,5 +55,13 @@
* @date 2022-03-29 16:06:56
*/
List<ComBatteryCommodityOrderCollageTeamVo> queryAllByList(@Param("dto") PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);
+
+ /**
+ * 查询用户是否已经参与以下团队信息
+ * @param teamId 团队id
+ * @param userId 用户id
+ * @return 是否已经参与以下团队信息
+ */
+ Map<String,Object> getUserCollageDetail(@Param("teamId") Long teamId,@Param("userId") Long userId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
index b91cdea..ea27886 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
+import java.util.Map;
/**
* title: 电动车商城-订单表表数据库访问层
@@ -54,5 +55,9 @@
* @date 2022-03-29 16:05:36
*/
List<ComBatteryCommodityOrderVo> queryAllByList(@Param("dto") PageComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+ ComBatteryActivityTeamVo queryTeamIdByUserId(@Param("userId") Long userId, @Param("activityId") Long activityId);
+
+ ComBatteryActivityTeamVo queryTeamIdByUserIdBargain(@Param("userId") Long userId, @Param("activityId") Long activityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
index 2919b33..ddbe2df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java
@@ -110,5 +110,14 @@
int YXJ = 2;
int YJS = 3;
}
+
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ public interface Type{
+ int PT = 1;
+ int KJ = 2;
+ int MS = 3;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
index b541572..65c274e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* title: 电动车商城-商家活动表表服务接口
@@ -59,11 +60,12 @@
* description detailById 查询详情
*
* @param id 主键id
+ * @param userId 用户id
* @return 详情数据
* @author lyq
* @date 2022-03-29 13:17:40
*/
- R detailById(Long id);
+ R detailById(Long id,Long userId);
/**
* description queryByPage 查询列表
@@ -83,4 +85,5 @@
*/
R updateStatus(Long id,Integer status);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java
index 0d5181c..d880f8c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java
@@ -63,7 +63,7 @@
* @author lyq
* @date 2022-03-29 16:06:57
*/
- R detailById(Long id);
+ R detailById(Long id,Long userId);
/**
* description queryByPage 查询列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java
index 01ba389..6e8f049 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java
@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service.impl;
+import com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityVo;
import com.panzhihua.service_community.dao.ComBatteryCommodityMapper;
+import com.panzhihua.service_community.dao.ComBatteryCommodityOrderMapper;
import com.panzhihua.service_community.entity.ComBatteryCommodityActivity;
import com.panzhihua.service_community.dao.ComBatteryCommodityActivityMapper;
import com.panzhihua.service_community.service.ComBatteryCommodityActivityService;
@@ -14,6 +17,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* title: 电动车商城-商家活动表表服务实现类
@@ -30,6 +35,8 @@
@Resource
private ComBatteryCommodityMapper commodityMapper;
+ @Resource
+ private ComBatteryCommodityOrderMapper commodityOrderMapper;
/**
* description queryByPage 分页查询
@@ -106,16 +113,33 @@
* description detailById 查询详情
*
* @param id 主键id
+ * @param userId 用户id
* @return 详情数据
* @author lyq
* @date 2022-03-29 13:17:40
*/
@Override
- public R detailById(Long id) {
+ public R detailById(Long id,Long userId) {
ComBatteryCommodityActivityVo commodityActivityVo = this.baseMapper.queryById(id);
if(commodityActivityVo != null){
ComBatteryCommodityVo commodityVo = commodityMapper.queryById(commodityActivityVo.getCommodityId());
commodityActivityVo.setCommodityVo(commodityVo);
+ if(userId != null && userId > 0){
+ //查询用户参与拼团活动信息
+ ComBatteryActivityTeamVo ptResult = commodityOrderMapper.queryTeamIdByUserId(userId,id);
+ if(ptResult != null && ptResult.getTeamId() != null){
+ commodityActivityVo.setIsOpen(2);
+ commodityActivityVo.setTeamId(ptResult.getTeamId());
+ commodityActivityVo.setTeamEndTime(ptResult.getTeamEndTime());
+ }
+ //查询用户参与砍价活动信息
+ ComBatteryActivityTeamVo kjResult =commodityOrderMapper.queryTeamIdByUserIdBargain(userId,id);
+ if(kjResult != null && kjResult.getTeamId() != null){
+ commodityActivityVo.setIsBargain(2);
+ commodityActivityVo.setBargainId(kjResult.getTeamId());
+ commodityActivityVo.setBargainEndTime(kjResult.getTeamEndTime());
+ }
+ }
}
return R.ok(commodityActivityVo);
}
@@ -149,4 +173,5 @@
}
return R.fail("修改失败");
}
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java
index d99d248..3d792d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java
@@ -216,7 +216,9 @@
Integer count = commodityOrderMapper.selectCount(new QueryWrapper<ComBatteryCommodityOrder>()
.lambda().eq(ComBatteryCommodityOrder::getStatus,ComBatteryCommodityOrder.Status.DKJ)
.eq(ComBatteryCommodityOrder::getBargainStatus,ComBatteryCommodityOrder.BargainStatus.KJZ)
- .eq(ComBatteryCommodityOrder::getIsDel,ComBatteryCommodityOrder.IsDel.NO));
+ .eq(ComBatteryCommodityOrder::getIsDel,ComBatteryCommodityOrder.IsDel.NO)
+ .eq(ComBatteryCommodityOrder::getActivityId,orderDto.getActivityId())
+ .eq(ComBatteryCommodityOrder::getUserId,orderDto.getUserId()));
if(count > 0){
return R.fail("您已存在正在砍价中的订单，不可再发起砍价订单");
}
@@ -262,7 +264,7 @@
commodityOrder.setActivityId(commodityActivity.getId());
commodityOrder.setCommodityId(commodity.getId());
commodityOrder.setSpecsId(commoditySpecs.getId());
- commodityOrder.setOrderNo("PT" + Snowflake.getId());
+ commodityOrder.setOrderNo("KJ" + Snowflake.getId());
commodityOrder.setActivityType(commodityActivity.getType());
commodityOrder.setStatus(ComBatteryCommodityOrder.Status.DFK);
commodityOrder.setPayStatus(ComBatteryCommodityOrder.PayStatus.WZF);
@@ -346,6 +348,12 @@
return R.fail("该砍价活动已结束");
}
}
+ Integer count = orderBargainRecordMapper.selectCount(new QueryWrapper<ComBatteryCommodityOrderBargainRecord>().lambda()
+ .eq(ComBatteryCommodityOrderBargainRecord::getBargainId,orderDto.getBargainId())
+ .eq(ComBatteryCommodityOrderBargainRecord::getUserId,orderDto.getUserId()));
+ if(count > 0){
+ return R.fail("您已经参加此砍价，不可重复参加");
+ }
//商品原价
BigDecimal originalPrice = orderBargain.getOriginalPrice();
//商品目标价格
@@ -360,7 +368,7 @@
BigDecimal minPrice = originalPrice.subtract(targetPrice).multiply(BigDecimal.valueOf(0.05));
BigDecimal randomNumber = MathUtils.getRandomNumber(maxPrice,minPrice);
if(randomNumber.compareTo(surplusPrice) > 0){
- randomNumber = currentPrice;
+ randomNumber = surplusPrice;
}
//初始化用户帮砍价记录
ComBatteryCommodityOrderBargainRecord orderBargainRecord = getOrderBargainRecord(orderBargain.getId()
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java
index 8b99628..09350d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.constants.PayCpmstant;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamPeopleVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamVo;
@@ -81,7 +82,24 @@
*/
@Override
public R queryByPage(PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam) {
- return R.ok(this.baseMapper.queryAllByLimit(comBatteryCommodityOrderCollageTeam, new Page(comBatteryCommodityOrderCollageTeam.getPageNum(), comBatteryCommodityOrderCollageTeam.getPageSize())));
+ IPage<ComBatteryCommodityOrderCollageTeamVo> orderCollageTeamVoIPage = this.baseMapper.queryAllByLimit(comBatteryCommodityOrderCollageTeam
+ , new Page(comBatteryCommodityOrderCollageTeam.getPageNum(), comBatteryCommodityOrderCollageTeam.getPageSize()));
+ //判断该用户是否参与了以下拼团
+ if(comBatteryCommodityOrderCollageTeam.getUserId() != null && comBatteryCommodityOrderCollageTeam.getUserId() != 0L){
+ Long userId = comBatteryCommodityOrderCollageTeam.getUserId();
+ orderCollageTeamVoIPage.getRecords().forEach(orderCollageTeam -> {
+ Map<String,Object> resultMap = this.baseMapper.getUserCollageDetail(orderCollageTeam.getId(),userId);
+ if(resultMap != null){
+ if(Integer.parseInt(resultMap.get("ktCount").toString()) > 0){
+ orderCollageTeam.setIsPartake(2);
+ }
+ if(Integer.parseInt(resultMap.get("ptCount").toString()) > 0){
+ orderCollageTeam.setIsPartake(2);
+ }
+ }
+ });
+ }
+ return R.ok(orderCollageTeamVoIPage);
}
/**
@@ -148,11 +166,24 @@
* @date 2022-03-29 16:06:58
*/
@Override
- public R detailById(Long id) {
+ public R detailById(Long id,Long userId) {
ComBatteryCommodityOrderCollageTeamVo orderCollageTeamVo = this.baseMapper.queryById(id);
if(orderCollageTeamVo != null){
List<ComBatteryCommodityOrderCollageTeamPeopleVo> collageTeamPeopleList = orderCollageTeamPeopleMapper.queryAllByTeamId(id);
orderCollageTeamVo.setOrderCollageTeamPeopleList(collageTeamPeopleList);
+ //判断该用户是否参与了以下拼团
+ if(userId != null && userId != 0L){
+ Map<String,Object> resultMap = this.baseMapper.getUserCollageDetail(orderCollageTeamVo.getId(),userId);
+ if(resultMap != null){
+ if(Integer.parseInt(resultMap.get("ktCount").toString()) > 0){
+ orderCollageTeamVo.setIsPartake(2);
+ }
+ if(Integer.parseInt(resultMap.get("ptCount").toString()) > 0){
+ orderCollageTeamVo.setIsPartake(2);
+ }
+ }
+ }
+
}
return R.ok(orderCollageTeamVo);
}
@@ -188,9 +219,6 @@
if(commodityActivity.getEndTime().getTime() - System.currentTimeMillis() <= 0
|| commodityActivity.getStatus().equals(ComBatteryCommodityActivity.Status.YJS)){
return R.fail("该活动已结束");
- }
- if(commodityActivity.getCommodityNum() <= commodityActivity.getCommoditySaleNum()){
- return R.fail("活动商品已售空");
}
if(orderDto.getType().equals(StartFightOrderDto.Type.PT)){
//判断该团队人数是否已满
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
index 4f9c737..f1185b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
@@ -402,6 +402,13 @@
commoditySpecs.setUpdateAt(nowDate);
commoditySpecsMapper.updateById(commoditySpecs);
}
+ if(commodityOrder.getActivityId() != null){
+ ComBatteryCommodityActivity commodityActivity = commodityActivityMapper.selectById(commodityOrder.getActivityId());
+ if(!commodityActivity.getType().equals(ComBatteryCommodityActivity.Type.PT)){
+ commodityActivity.setCommoditySaleNum(commodityActivity.getCommoditySaleNum() - commodityOrder.getCount());
+ commodityActivityMapper.updateById(commodityActivity);
+ }
+ }
});
return R.ok();
}
@@ -501,6 +508,7 @@
//用户开团,创建团队信息
orderCollageTeam = getOrderCollageTeam(commodityOrder,nowDate);
orderCollageTeamMapper.insert(orderCollageTeam);
+ commodityOrder.setTeamId(orderCollageTeam.getId());
}else{
//用户参团,查询参加的团队信息
orderCollageTeam = orderCollageTeamMapper.selectById(commodityOrder.getTeamId());
@@ -510,11 +518,7 @@
ComBatteryCommodityOrderCollageTeamPeople orderCollageTeamPeople = getOrderCollageTeamPeople(commodityOrder.getUserId()
,nowDate,orderCollageTeam,notifyOrderDTO.getAttach());
orderCollageTeamPeopleMapper.insert(orderCollageTeamPeople);
- //判断当前拼团人员是否已足够成团
- syncAssortedDoughStatus(orderCollageTeam.getId(),nowDate);
}
- //判断当前拼团活动是否已完成
- syncAssortedDoughActivityStatus(commodityOrder.getActivityId(),nowDate);
break;
case ComBatteryCommodityOrder.ActivityType.KJ:
//砍价订单成功支付处理
@@ -540,6 +544,15 @@
commodityOrder.setUpdateAt(nowDate);
commodityOrder.setPayTime(payTime);
this.baseMapper.updateById(commodityOrder);
+
+ if(commodityOrder.getTeamId() != null){
+ //判断当前拼团人员是否已足够成团
+ syncAssortedDoughStatus(commodityOrder.getTeamId(),nowDate);
+ }
+ if(commodityOrder.getActivityId() != null && commodityOrder.getActivityType().equals(ComBatteryCommodityOrder.ActivityType.PT)){
+ //判断当前拼团活动是否已完成
+ syncAssortedDoughActivityStatus(commodityOrder.getActivityId(),nowDate);
+ }
return R.ok();
}
@@ -613,7 +626,7 @@
if(commodityActivity != null){
Integer count = orderCollageTeamPeopleMapper.selectCount(new QueryWrapper<ComBatteryCommodityOrderCollageTeamPeople>()
.lambda().eq(ComBatteryCommodityOrderCollageTeamPeople::getTeamId,teamId));
- if(count >= commodityActivity.getCollageNum()){
+ if(count >= commodityActivity.getCollagePeopleNum()){
//拼团条件满足，将所有已拼单的用户的订单更新为待发货状态
//更新拼团团队记录
orderCollageTeam.setStatus(ComBatteryCommodityOrderCollageTeam.Status.PTCG);
@@ -651,7 +664,7 @@
//查询商品信息
ComBatteryCommodity commodity = commodityMapper.selectById(commodityOrder.getCommodityId());
if(commodity != null){
- orderBargain.setCurrentPrice(commodity.getPrice());
+ orderBargain.setOriginalPrice(commodity.getPrice());
orderBargain.setCurrentPrice(commodity.getPrice());
}
//查询活动信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml
index 7a5b68a..5d61b62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml
@@ -46,6 +46,7 @@
cbca.update_at,
cbca.update_by,
cbca.specs_id,
+ cbca.commodity_sale_num,
cbcs.`name` as specsName,
cbc.`name` as commodityName,
cbc.`code` as commodityCode,
@@ -79,6 +80,7 @@
cbca.update_at,
cbca.update_by,
cbca.specs_id,
+ cbca.commodity_sale_num,
cbcs.`name` as specsName,
cbc.`name` as commodityName,
cbc.`code` as commodityCode,
@@ -88,6 +90,9 @@
left join com_battery_commodity as cbc on cbc.id = cbca.commodity_id
left join com_battery_store as cbs on cbs.id = cbca.store_id
left join com_battery_commodity_specs as cbcs on cbcs.id = cbca.specs_id
+ <if test="dto.userId != null">
+ left join com_battery_commodity_order as cbco on cbco.activity_id = cbca.id
+ </if>
<where>
and cbca.is_del = 2
<if test="dto.id != null">
@@ -95,6 +100,9 @@
</if>
<if test="dto.type != null">
and cbca.type = #{dto.type}
+ </if>
+ <if test="dto.userId != null">
+ and cbco.user_id = #{dto.userId} and cbco.pay_status = 2 and cbco.is_del = 2
</if>
<if test="dto.commodityId != null">
and cbca.commodity_id = #{dto.commodityId}
@@ -104,6 +112,9 @@
</if>
<if test="dto.status != null">
and cbca.status = #{dto.status}
+ </if>
+ <if test="dto.isApplets != null and dto.isApplets == 1">
+ and cbca.status in (1,3)
</if>
<if test="dto.keyWord != null and dto.keyWord != ''">
and (
@@ -137,6 +148,7 @@
cbca.update_at,
cbca.update_by,
cbca.specs_id,
+ cbca.commodity_sale_num,
cbcs.`name` as specsName,
cbc.`name` as commodityName,
cbc.`code` as commodityCode,
@@ -146,10 +158,16 @@
left join com_battery_commodity as cbc on cbc.id = cbca.commodity_id
left join com_battery_store as cbs on cbs.id = cbca.store_id
left join com_battery_commodity_specs as cbcs on cbcs.id = cbca.specs_id
+ <if test="dto.userId != null">
+ left join com_battery_commodity_order as cbco on cbco.activity_id = cbca.id
+ </if>
<where>
and cbca.is_del = 2
<if test="dto.id != null">
and cbca.id = #{dto.id}
+ </if>
+ <if test="dto.userId != null">
+ and cbco.user_id = #{dto.userId} and cbco.pay_status = 2 and cbco.is_del = 2
</if>
<if test="dto.type != null">
and cbca.type = #{dto.type}
@@ -163,6 +181,9 @@
<if test="dto.status != null">
and cbca.status = #{dto.status}
</if>
+ <if test="dto.isApplets != null and dto.isApplets == 1">
+ and cbca.status in (1,3)
+ </if>
<if test="dto.keyWord != null and dto.keyWord != ''">
and (
cbca.`name` like concat ('%',#{statisticsAdminDTO.keyWord},'%') or
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml
index eb3b3e7..147504c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml
@@ -36,6 +36,7 @@
su.nick_name as nickName,
su.image_url as imageUrl,
cbc.`name` as commodityName,
+ cbc.images as commodityImages,
cbco.bargain_status
FROM
com_battery_commodity_order_bargain as cbcob
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml
index 983b8d1..4c00d60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml
@@ -65,9 +65,6 @@
<if test="dto.orderNo != null and dto.orderNo != ''">
and cbcoot.order_no = #{dto.orderNo}
</if>
- <if test="dto.userId != null">
- and cbcoot.user_id = #{dto.userId}
- </if>
<if test="dto.status != null">
and cbcoot.status = #{dto.status}
</if>
@@ -116,5 +113,15 @@
order by cbcoot.create_at desc
</select>
+ <select id="getUserCollageDetail" resultType="map">
+ SELECT
+ count( id ) as ktCount,
+ (select count(id) from com_battery_commodity_order_collage_team_people where team_id = #{teamId} and user_id = #{userId} and `type` = 2) as ptCount
+ FROM
+ com_battery_commodity_order_collage_team_people
+ WHERE
+ team_id = #{teamId} AND head_user_id = #{userId}
+ </select>
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml
index e224c2d..1e4d05e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml
@@ -128,6 +128,7 @@
cbco.receiving_region,
cbco.receiving_address,
su.phone,
+ su.nick_name as nickName,
cbc.`name` as commodityName,
cbcs.`images` as commodityImages,
cbcs.`name` as specsName
@@ -170,6 +171,9 @@
</if>
<if test="dto.payType != null">
and cbco.pay_type = #{dto.payType}
+ </if>
+ <if test="dto.isApplets != null and dto.isApplets == 1">
+ and cbco.status in (2,3,4)
</if>
<if test="dto.payNo != null and dto.payNo != ''">
and cbco.pay_no = #{dto.payNo}
@@ -267,5 +271,16 @@
order by cbco.create_at desc
</select>
+ <select id="queryTeamIdByUserId" resultType="com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo">
+ select id as teamId,create_at as teamEndTime from com_battery_commodity_order_collage_team
+ where activity_id = #{activityId} and user_id = #{userId} and status = 1
+ </select>
+
+ <select id="queryTeamIdByUserIdBargain" resultType="com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo">
+ select cbcob.id as teamId,cbcob.create_at as teamEndTime from com_battery_commodity_order_bargain as cbcob
+ left join com_battery_commodity_order as cbco on cbco.id = cbcob.order_id
+ where cbcob.user_id = #{userId} and cbcob.activity_id = #{activityId} and cbco.bargain_status = 1
+ </select>
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml
index 7ca4616..3058f7d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml
@@ -42,24 +42,26 @@
<!--查询指定行数据-->
<select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComBatteryCommoditySpecsVo">
select
- id, store_id, commodity_id, name, stock, price, images, is_del, create_at, create_by, update_at, update_by
- from com_battery_commodity_specs
+ cbcs.id, cbcs.store_id, cbcs.commodity_id, cbcs.`name`, cbcs.stock, cbcs.price, cbcs.images, cbcs.is_del, cbcs.create_at
+ , cbcs.create_by, cbcs.update_at, cbcs.update_by,cbc.`name` as commodityName
+ from com_battery_commodity_specs as cbcs
+ left join com_battery_commodity as cbc on cbc.id = cbcs.commodity_id
<where>
- and is_del = 2
+ and cbcs.is_del = 2
<if test="dto.id != null">
- and id = #{dto.id}
+ and cbcs.id = #{dto.id}
</if>
<if test="dto.storeId != null">
- and store_id = #{dto.storeId}
+ and cbcs.store_id = #{dto.storeId}
</if>
<if test="dto.commodityId != null">
- and commodity_id = #{dto.commodityId}
+ and cbcs.commodity_id = #{dto.commodityId}
</if>
<if test="dto.keyWord != null and dto.keyWord != ''">
- and `name` like concat('%',#{dto.keyWord},'%')
+ and cbcs.`name` like concat('%',#{dto.keyWord},'%')
</if>
</where>
- order by create_at desc
+ order by cbcs.create_at desc
</select>
<!--查询所有数据-->
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
index 22f70ec..f5f8c35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -303,6 +303,7 @@
noLoginUrl.add("/api/applets/fms/service/page");
noLoginUrl.add("/api/applets/fms/service/detail");
noLoginUrl.add("/api/applets/wx/batteryPayNotify");
+ noLoginUrl.add("/api/applets/wx/batteryActivityPayNotify");
if (noLoginUrl.contains(requestURI)) {
List<SimpleGrantedAuthority> authorities = new ArrayList<>();
authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));
--
Gitblit v1.7.1