From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 28 ++-
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 8
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java | 7 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java | 10
ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysRoleMapper.xml | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerTotalController.java | 8
ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysUserMapper.xml | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/QiYeUtils.java | 25 +++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 11 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/fliter/ParamsAuthFilter.java | 2
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 2
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml | 4
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 8
ruoyi-gateway/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysDeptMapper.xml | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 29 ++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 61 +++++++--
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 13 +-
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 8 +
ruoyi-auth/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 40 ++++--
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml | 3
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 8 +
ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml | 8 +
29 files changed, 245 insertions(+), 92 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 8541c04..73946a3 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 4a64425..6225769 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
index 9963b58..f58b95a 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -22,17 +22,17 @@
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
#pro
- #namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#dev
- namespace: d39a744d-116f-4280-8445-0502dd1a3116
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
#pro
- #namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#dev
- namespace: d39a744d-116f-4280-8445-0502dd1a3116
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
index 1367b5d..3905ad3 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 4846aa0..798f229 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -141,7 +141,8 @@
if (nowTime.compareTo(activityStartTime) < 0) {
activity.setActivityStatus(0);
} else {
- throw new ServiceException(AppErrorConstant.ACTIVITY_TIME_ERROR);
+ activity.setActivityStatus(1);
+
}
// 设置活动信息
activity.setActivityName(mgtActivityEditDto.getActivityName());
@@ -204,21 +205,37 @@
long currentTimeMillis = System.currentTimeMillis();
long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
long endTimeDifference = activityEndTime.getTime() - currentTimeMillis;
- // 查询延时任务
- DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
- // 如果延时任务为空，创建延时任务控制活动定时开始和结束
- if (startDelayTask == null) {
- redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(new Date());
- startDelayTask.setEndTime(activityStartTime);
- startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
- remoteConfigService.addDelayTask(startDelayTask);
+ //判断任务是否已经开始,已经开始则3秒后立即开始
+ if(nowTime.compareTo(activityStartTime) > 0){
+ // 查询延时任务
+ DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (startDelayTask == null) {
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, 3L, TimeUnit.SECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }else{
+ if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, 3L, TimeUnit.SECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }
+ }
}else{
- if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
- remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
- redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ // 查询延时任务
+ DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (startDelayTask == null) {
redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
startDelayTask = new DelayTask();
startDelayTask.setDelFlag(0);
@@ -226,6 +243,18 @@
startDelayTask.setEndTime(activityStartTime);
startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
remoteConfigService.addDelayTask(startDelayTask);
+ }else{
+ if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(activityStartTime);
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }
}
}
// 查询延时任务
@@ -490,7 +519,7 @@
remoteConfigService.addDelayTask(startDelayTask);
}
// 查询延时任务
- DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId).getData();
// 如果延时任务为空，创建延时任务控制活动定时开始和结束
if (endDelayTask == null) {
redisService.setCacheObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId, activityEndTime, endTimeDifference, TimeUnit.MILLISECONDS);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index 91e477e..e0b0bf5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
index e2cda09..2725ba0 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerTotalController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerTotalController.java
index 2131241..e9213c4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerTotalController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerTotalController.java
@@ -33,7 +33,7 @@
private MemberService memberService;
@RequestMapping(value = "/getMerMemberTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户会员人数统计")
+ @ApiOperation(value = "获取商户会员人数统计(会员概况)")
public R<MerMemberTotalVo> getMerMemberTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -42,7 +42,7 @@
}
@RequestMapping(value = "/getMerMemberFixedTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户会员固定统计")
+ @ApiOperation(value = "获取商户会员固定统计(性别年龄分布/调理问题/会员等级/客户类型/活跃度/消费排行)")
public R<MerMemberFixedTotalVo> getMerMemberFixedTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -51,7 +51,7 @@
}
@RequestMapping(value = "/getMerMemberSourceTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户会员来源统计")
+ @ApiOperation(value = "获取商户会员来源统计(来源渠道)")
public R<MerMemberSourceTotalVo> getMerMemberSourceTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -60,7 +60,7 @@
}
@RequestMapping(value = "/getMerMemberRecommendTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户会员推荐统计")
+ @ApiOperation(value = "获取商户会员推荐统计(推荐榜单)")
public R<MerMemberRecommendTotalVo> getMerMemberRecommendTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
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 4cb8276..e937607 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
@@ -1639,7 +1639,7 @@
menPercent = new BigDecimal("100.00");
womenPercent = new BigDecimal("0.00");
}else{
- menPercent = manTotalBig.divide(personTotalBig,0,BigDecimal.ROUND_HALF_UP);
+ menPercent = manTotalBig.divide(personTotalBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
womenPercent = bigTen.subtract(menPercent);
}
memberFixedTotalVo.setManPercent(menPercent);
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 58dc3e4..b31b590 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
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 c3b56f6..9d44a88 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
@@ -289,7 +289,8 @@
tc.money_threshold moneyThreshold,
tc.discount_money discountMoney,
tc.discount_percent discountPercent,
- tc.create_time createTime
+ tc.create_time createTime,
+ tc.propaganda_poster propagandaPoster
FROM t_coupon tc
LEFT JOIN t_coupon_total tct ON tc.coupon_id = tct.coupon_id
WHERE tc.del_flag = 0 AND tc.coupon_status = 1 AND tc.coupon_from = 1
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
index 2eab604..177b984 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
@@ -194,7 +194,7 @@
</update>
<update id="useMemberCoupon">
- UPDATE t_member_coupon SET coupon_status = 2
+ UPDATE t_member_coupon SET coupon_status = 2,use_time = CURRENT_TIME
WHERE del_flag = 0 AND coupon_status = 1 AND FIND_IN_SET(id, #{memberCouponIds}) > 0
</update>
@@ -225,7 +225,7 @@
</select>
<update id="sureMemberCoupon">
- UPDATE t_member_coupon SET coupon_status = 2,shop_id = #{shopId}
+ UPDATE t_member_coupon SET coupon_status = 2,shop_id = #{shopId},use_time = CURRENT_TIME
WHERE del_flag = 0 AND coupon_status = 1 AND id = #{memberCouponId}
</update>
</mapper>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
index 6f6333e..c7a3e45 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
@@ -30,7 +30,7 @@
private OrderService orderService;
@RequestMapping(value = "/getMerOrderTotal", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取订单统计")
+ @ApiOperation(value = "商户获取订单统计(订单概况/营业额概况)")
public R<MerOrderTotalVo> getMerOrderTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -39,7 +39,7 @@
}
@RequestMapping(value = "/getMerOrderDistributionTotal", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取订单分布统计")
+ @ApiOperation(value = "商户获取订单分布统计(订单分布)")
public R<MerOrderDistributionTotalVo> getMerOrderDistributionTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -48,7 +48,7 @@
}
@RequestMapping(value = "/getMerOrderTypeTotal", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取销售占比统计")
+ @ApiOperation(value = "商户获取销售占比统计(销售占比)")
public R<MerOrderTypeTotalVo> getMerOrderTypeTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -57,7 +57,7 @@
}
@RequestMapping(value = "/getMerOrderGoodsRank", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取销售排行")
+ @ApiOperation(value = "商户获取销售排行(销售排行)")
public R<MerOrderGoodsRankVo> getMerOrderGoodsRank(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -66,7 +66,7 @@
}
@RequestMapping(value = "/getMerOrderFromRank", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取渠道排行")
+ @ApiOperation(value = "商户获取渠道排行(渠道排行)")
public R<MerOrderFromRankVo> getMerOrderFromRank(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index c403e01..5dd34f9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -444,6 +444,17 @@
/**
* @description
+ * @author jqs
+ * @date 2023/6/25 17:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ MerHomeShopTotalVo getMerHomeShopServiceTotalVo(Long shopId);
+
+
+
+ /**
+ * @description
* @author cheny
* @param shopIds
* @return MerHomeShopTotalVo
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index 30aa101..df34a6f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -23,7 +23,6 @@
import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.MemberTotalChangeDto;
-import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
@@ -197,7 +196,7 @@
memberTotalChangeDto.setTypeService(1);
memberTotalChangeDto.setServiceCount(serviceCount);
remoteMemberService.changeMemberTotal(memberTotalChangeDto);
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(merSureConsumerGoodsDto.getShopId());
shopTotalChangeDto.setTypeCycleService(1);
shopTotalChangeDto.setCycleService(cycleService);
@@ -208,7 +207,7 @@
shopTotalChangeDto.setTypeExperienceService(1);
shopTotalChangeDto.setExperienceService(experienceService);
shopTotalChangeDto.setExperiencePerson(experiencePerson);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
}
}
@@ -332,7 +331,7 @@
memberTotalChange.setTypeService(2);
memberTotalChange.setServiceCount(serviceCount);
remoteMemberService.changeMemberTotal(memberTotalChange);
- ShopTotalChangeDto shopTotalChange = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChange = new ShopTotalChangeDto();
shopTotalChange.setShopId(merSureConsumerGoodsDto.getShopId());
shopTotalChange.setTypeCycleService(2);
shopTotalChange.setCycleService(cycleService);
@@ -343,7 +342,7 @@
shopTotalChange.setTypeExperienceService(2);
shopTotalChange.setExperienceService(experienceService);
shopTotalChange.setExperiencePerson(experiencePerson);
- remoteShopService.changeShopTotal(shopTotalChange);
+ remoteShopService.changeShopTotal(shopTotalChange);*/
if(!consumerGoodsList.isEmpty()){
Member member = remoteMemberService.getMember(userId).getData();
try {
@@ -511,7 +510,7 @@
memberTotalChangeDto.setTypeService(1);
memberTotalChangeDto.setServiceCount(serviceCount);
remoteMemberService.changeMemberTotal(memberTotalChangeDto);
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(shopId);
shopTotalChangeDto.setOrderType(1);
shopTotalChangeDto.setTypeCycleService(1);
@@ -523,7 +522,7 @@
shopTotalChangeDto.setTypeExperienceService(1);
shopTotalChangeDto.setExperienceService(experienceService);
shopTotalChangeDto.setExperiencePerson(experiencePerson);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
return this.saveBatch(consumerGoodsList);
}
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index d1cce04..3c83650 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1294,9 +1294,15 @@
@Override
public MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo) {
Long shopId = merHomeShopTotalVo.getShopId();
+ //获取今日到店
Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
+ //获取待处理订单和营业额
merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
+ //获取服务统计
+ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId);
merHomeShopTotalVo.setTodayShop(todayShop);
+ merHomeShopTotalVo.setCycleSurp(serviceTotalVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(serviceTotalVo.getExplorationSurp());
return merHomeShopTotalVo;
}
@@ -1625,18 +1631,18 @@
//如果是商户优惠券，验证商户一致
if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
- throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
- if(memberCoupon.getShopId().equals(shopId)){
+ if(!memberCoupon.getShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
//如果是平台优惠券，当用户绑定商户时验证商户一致
if (memberCoupon.getCouponFrom() == 1 && member.getBindingFlag() == 1) {
- if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
+ /*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
- }
- if(memberCoupon.getShopId().equals(shopId)){
+ }*/
+ if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
@@ -2201,14 +2207,14 @@
remoteMemberService.updateMemberBinding(appMemberBindingDto);
}
//更新商户统计
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setOrderType(1);
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
//创建支付记录
PayRecord payRecord = new PayRecord();
payRecord.setDelFlag(0);
@@ -3261,18 +3267,18 @@
//如果是商户优惠券，验证商户一致
if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
- throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
- if(memberCoupon.getShopId().equals(shopId)){
+ if(!memberCoupon.getShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
//如果是平台优惠券，当用户绑定商户时验证商户一致
if (memberCoupon.getCouponFrom() == 1 && member.getBindingFlag() == 1) {
- if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
+ /*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
- }
- if(memberCoupon.getShopId().equals(shopId)){
+ }*/
+ if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
}
@@ -3428,7 +3434,9 @@
merTotalDto.setShopIdList(shopIdList);
merTotalDto.setShopId(null);
}
+ //线上线下活动订单
MerOrderTotalVo orderTotalVo = orderMapper.getMerOrderTotalOrderFrom(merTotalDto);
+ //分类型订单
MerOrderTotalVo goodsTypeVo = orderMapper.getMerTotalOrderTotalGoodsType(merTotalDto);
orderTotalVo.setCycleTotal(goodsTypeVo.getCycleTotal());
orderTotalVo.setCycleMoney(goodsTypeVo.getCycleMoney());
@@ -3835,14 +3843,14 @@
//更新商品统计
remoteGoodsService.changeGoodsTotal(goodsTotalChangeDtoList);
// 更新商户统计信息
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setOrderType(1);
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
// 初始化会员统计信息
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
memberTotalChangeDto.setUserId(order.getUserId());
@@ -4011,14 +4019,14 @@
}
}
// 更新商户统计信息
- ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+ /*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setOrderType(2);
shopTotalChangeDto.setShopId(order.getShopId());
shopTotalChangeDto.setCycleMoney(cycleMoney);
shopTotalChangeDto.setServiceMoney(serviceMoney);
shopTotalChangeDto.setExperienceMoney(experienceMoney);
shopTotalChangeDto.setGoodsMoney(goodsMoney);
- remoteShopService.changeShopTotal(shopTotalChangeDto);
+ remoteShopService.changeShopTotal(shopTotalChangeDto);*/
// 初始化会员统计信息
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
memberTotalChangeDto.setUserId(order.getUserId());
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index 893fe2c..05d7cf8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -17,17 +17,17 @@
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
#pro
- #namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#dev
- namespace: d39a744d-116f-4280-8445-0502dd1a3116
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
#pro
- #namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#dev
- namespace: d39a744d-116f-4280-8445-0502dd1a3116
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
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 b1dc538..0010e74 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
@@ -132,7 +132,7 @@
<result column="orderFrom" property="orderFrom"/>
<result column="shopId" property="shopId"/>
<result column="verifyTime" property="verifyTime"/>
- <collection property="mgtOrderGoodsVoList"
+ <collection property="mgtOrderGoodsPageVoList"
ofType="com.ruoyi.order.domain.vo.MgtOrderGoodsPageVo"
select="listAllSimpleOrderGoodsByOrderId"
column="{orderId=orderId}">
@@ -151,7 +151,7 @@
<result column="payMoney" property="payMoney"/>
<result column="orderFrom" property="orderFrom"/>
<result column="orderStatus" property="orderStatus"/>
- <collection property="mgtOrderGoodsVoList"
+ <collection property="mgtOrderGoodsPageVoList"
ofType="com.ruoyi.order.domain.vo.MgtOrderGoodsPageVo"
select="listAllSimpleOrderGoodsByOrderId"
column="{orderId=orderId">
@@ -455,8 +455,6 @@
toc.receivable_money receivableMoney,
toc.pay_money payMoney,
toc.change_receivable_money receiveMoney,
- tog.goods_name goodsName,
- tog.buy_num buyNum,
toc.create_time createTime,
toc.order_from orderFrom,
CASE toc.order_from
@@ -776,7 +774,7 @@
IFNULL(SUM(CASE WHEN tog.goods_type = 2 THEN tog.goods_receivable_money ELSE 0 END),0) serviceMoney
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1380,9 +1378,17 @@
<select id="getMerHomeShopTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
SELECT
IFNULL(SUM(CASE WHEN order_status = 2 THEN 1 ELSE 0 END),0) unHandleOrder,
- IFNULL(SUM(change_receivable_money),0) shopTurnover
+ IFNULL(SUM(CASE WHEN order_status = 3 THEN change_receivable_money ELSE 0 END),0) shopTurnover
FROM t_order
WHERE del_flag = 0 AND shop_id = #{shopId} AND order_status IN (2,3)
+ </select>
+
+ <select id="getMerHomeShopServiceTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
+ SELECT
+ COUNT(DISTINCT CASE WHEN goods_type = 1 THEN user_id END) cycleSurp,
+ COUNT(DISTINCT CASE WHEN goods_type = 3 THEN user_id END) explorationSurp
+ FROM t_consumer_goods
+ WHERE del_flag = 0 AND shop_id = #{shopId} AND cycle_num_flag = 1 AND service_status = 1
</select>
<select id="getMerHomeShopsTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
@@ -1416,7 +1422,7 @@
IFNULL(SUM(CASE WHEN order_from = 1 THEN change_receivable_money ELSE 0 END),0) onlineMoney,
IFNULL(SUM(CASE WHEN order_from = 3 THEN change_receivable_money ELSE 0 END),0) offlineMoney,
IFNULL(SUM(CASE WHEN order_from = 2 THEN change_receivable_money ELSE 0 END),0) activityMoney
- FROM t_order WHERE del_flag = 0 AND order_status IN (2,3)
+ FROM t_order WHERE del_flag = 0 AND order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1442,7 +1448,7 @@
SUM(tog.goods_receivable_money) AS mapValueSecond
FROM t_order toc
INNER JOIN t_order_goods tog ON toc.order_id = tog.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3) AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
+ WHERE toc.del_flag = 0 AND toc.order_status = 3 AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1463,7 +1469,7 @@
IFNULL(SUM(tog.goods_receivable_money),0) AS mapValueSecond
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1488,7 +1494,7 @@
IFNULL(SUM(tog.goods_receivable_money),0) mapValue
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.goodsType != null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
@@ -1520,7 +1526,7 @@
END mapKey,
IFNULL(SUM(toc.order_money),0) mapValue
FROM t_order toc
- WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.goodsType != null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
</if>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
index 71b97c5..1b1f773 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffShopController.java
@@ -17,6 +17,7 @@
import com.ruoyi.system.api.service.RemoteUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -29,6 +30,7 @@
@Api(value = "员工端商户接口", tags = "员工端商户接口", description = "员工端商户接口")
@RestController
@RequestMapping("/staff/shop")
+@Log4j2
public class StaffShopController {
@Resource
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/fliter/ParamsAuthFilter.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/fliter/ParamsAuthFilter.java
index 706a5ee..5f733c8 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/fliter/ParamsAuthFilter.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/fliter/ParamsAuthFilter.java
@@ -81,7 +81,7 @@
}
String requestBodyStr = stringBuilder.toString();
if(StringUtils.isNotBlank(requestBodyStr)){
- try {
+ try {
return JSONObject.parseObject(stringBuilder.toString(), Map.class);
}catch (Exception e){
e.printStackTrace();
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 166b0fd..b2915ae 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -792,13 +792,15 @@
shopIds = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
Shop shop = this.getShopByBelongUserId(userId);
shopIds.add(shop.getShopId());
+ userIds.add(userId);
}else {
//普通员工查询商户归属的shopId
Shop shop = this.getShopByBelongUserId(userId);
+
shopIds.add(shop.getShopId());
}
//分别查询
- StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(shopIds);
+ StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
staffHomeShopTotalVo.setFollowMember(0);
staffHomeShopTotalVo.setNewMember(0);
@@ -831,7 +833,6 @@
}
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- ShopTotal shopTotal = shopTotalService.getById(shopId);
merHomeShopTotalVo.setShopId(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
@@ -839,8 +840,8 @@
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
merHomeShopTotalVo.setTask(taskCount);
merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
- merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ merHomeShopTotalVo.setCycleSurp(orderVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
return merHomeShopTotalVo;
@@ -1138,15 +1139,19 @@
MgtShopAuthGetVo shopAuthGetVo = new MgtShopAuthGetVo();
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(authId);
BeanUtils.copyProperties(shopAuthentication, shopAuthGetVo);
- if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){
- shopAuthGetVo.setBlBusinessFoeverFlag(1);
- }else{
- shopAuthGetVo.setBlBusinessFoeverFlag(0);
+ if(shopAuthGetVo.getBlBusinessDeanline()!=null){
+ if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){
+ shopAuthGetVo.setBlBusinessFoeverFlag(1);
+ }else{
+ shopAuthGetVo.setBlBusinessFoeverFlag(0);
+ }
}
- if(shopAuthGetVo.getLpIcEndDate().equals("长期")){
- shopAuthGetVo.setLpIcForeverFlag(1);
- }else{
- shopAuthGetVo.setLpIcForeverFlag(0);
+ if(shopAuthGetVo.getLpIcEndDate()!=null){
+ if(shopAuthGetVo.getLpIcEndDate().equals("长期")){
+ shopAuthGetVo.setLpIcForeverFlag(1);
+ }else{
+ shopAuthGetVo.setLpIcForeverFlag(0);
+ }
}
return shopAuthGetVo;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index e960bb0..796d85f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -16,10 +16,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
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 3be5496..5ec387e 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
@@ -406,7 +406,7 @@
ts.shopowner_phone shopownerPhone,
ts.cooperation_end_time cooperationEndTime,
ts.cooperative_flag cooperativeFlag,
- tsf.file_uel shopPicture
+ tsf.file_url shopPicture
FROM t_shop ts
LEFT JOIN t_shop_file tsf ON tsf.shop_id = ts.shop_id AND tsf.del_flag = 0 AND tsf.file_type = 1
WHERE ts.del_flag = 0 AND ts.belong_shop_id = #{param.shopId}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
index 11c4e89..3c8a337 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
@@ -41,6 +41,7 @@
String timestamp = request.getParameter("timestamp");
String signature = request.getParameter("signature");
String msgSignature = request.getParameter("msg_signature");
+ String echostr = request.getParameter("echostr");
String encType = request.getParameter("encrypt_type");
String xml = IOUtils.toString(request.getReader());
log.info("企业微信回调参数nonce"+nonce);
@@ -49,10 +50,16 @@
log.info("企业微信回调参数msgSignature"+msgSignature);
log.info("企业微信回调参数encType"+encType);
log.info("企业微信回调参数xml"+xml);
+ log.info("企业微信回调参数echostr"+echostr);
if(StringUtils.isNotBlank(msgSignature)&&StringUtils.isNotBlank(timestamp)&&StringUtils.isNotBlank(nonce)&&StringUtils.isNotBlank(xml)){
String reponseStr = wxCryptUtil.decryptXml(msgSignature,timestamp,nonce,xml);
log.info("企业微信回调参数xml解析"+reponseStr);
}
+ if(StringUtils.isNotBlank(msgSignature)&&StringUtils.isNotBlank(timestamp)&&StringUtils.isNotBlank(nonce)&&StringUtils.isNotBlank(echostr)){
+ String reponseStr = wxCryptUtil.decryptXml(msgSignature,timestamp,nonce,echostr);
+ log.info("企业微信回调参数xml解析"+reponseStr);
+ return reponseStr;
+ }
return "SUCCESS";
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/QiYeUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/QiYeUtils.java
index eafc255..4af62ba 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/QiYeUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/QiYeUtils.java
@@ -3,6 +3,7 @@
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@@ -18,8 +19,28 @@
private final static String ACCESS_TOKEN_HOST = "https://qyapi.weixin.qq.com/cgi-bin/";
public static void main(String[] args) throws Exception {
- String accessToken = getAccessTokenByQY();
- System.out.println(accessToken);
+ Integer manTotal = 0;
+ Integer womenTotal = 0;
+ Integer personTotal = manTotal + womenTotal;
+ BigDecimal manTotalBig = new BigDecimal(manTotal);
+ BigDecimal personTotalBig = new BigDecimal(personTotal);
+ BigDecimal bigTen = new BigDecimal("100.00");
+ BigDecimal menPercent = new BigDecimal("100.00");
+ BigDecimal womenPercent = new BigDecimal("100.00");
+ if(manTotal==0&&womenTotal==0){
+ menPercent = new BigDecimal("50.00");
+ womenPercent = new BigDecimal("50.00");
+ }else if(manTotal==0&&womenTotal>0){
+ menPercent = new BigDecimal("0.00");
+ womenPercent = new BigDecimal("100.00");
+ }else if(manTotal>0&&womenTotal==0){
+ menPercent = new BigDecimal("100.00");
+ womenPercent = new BigDecimal("0.00");
+ }else{
+ menPercent = manTotalBig.divide(personTotalBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+ womenPercent = bigTen.subtract(menPercent);
+ }
+ System.out.println(menPercent+"-"+womenPercent);
}
public static String getAccessTokenByQY() throws Exception {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 551276b..fc7c6be 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -20,10 +20,18 @@
# 服务注册地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
#server-addr: 127.0.0.1:8848
+ #pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ #dev
+ #namespace: d39a744d-116f-4280-8445-0502dd1a3116
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysDeptMapper.xml
index 645ff84..ed7917b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysDeptMapper.xml
@@ -45,7 +45,7 @@
AND status = #{status}
</if>
<!-- 数据范围过滤 -->
- ${params.dataScope}
+ <!-- ${params.dataScope} -->
order by d.parent_id, d.order_num
</select>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysRoleMapper.xml
index b3fa82f..38154a8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysRoleMapper.xml
@@ -52,7 +52,7 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
- ${params.dataScope}
+ <!-- ${params.dataScope} -->
order by r.role_sort
</select>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysUserMapper.xml
index 945bdf2..355b4e4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysUserMapper.xml
@@ -84,7 +84,7 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
<!-- 数据范围过滤 -->
- ${params.dataScope}
+ <!-- ${params.dataScope} -->
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -101,7 +101,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 数据范围过滤 -->
- ${params.dataScope}
+ <!-- ${params.dataScope} -->
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -119,7 +119,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 数据范围过滤 -->
- ${params.dataScope}
+ <!-- ${params.dataScope} -->
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
--
Gitblit v1.7.1