From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index b8ad4ff..cd42728 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -95,7 +95,7 @@
public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)
{
ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
- Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到商户信息"));
+ Optional.ofNullable(shopRelUser).orElseThrow(() -> new ServiceException("未查询到用户关联商户"));
ShopRelUserVo shopRelUserVo = new ShopRelUserVo();
shopRelUserVo.setShopId(shopRelUser.getShopId());
shopRelUserVo.setUserName(shopRelUser.getUserName());
@@ -272,9 +272,9 @@
Integer platformCouponFlag = shop.getPlatformCouponFlag();
Integer platformBirthdayFlag = shop.getPlatformBirthdayFlag();
Integer marketingStatus = 0;
- if(platformCouponFlag==1&&platformBirthdayFlag==0){
+ if(platformCouponFlag==1&&platformBirthdayFlag==2){
marketingStatus = 1;
- }else if(platformCouponFlag==0&&platformBirthdayFlag==1){
+ }else if(platformCouponFlag==2&&platformBirthdayFlag==1){
marketingStatus = 2;
}else if(platformCouponFlag==1&&platformBirthdayFlag==1){
marketingStatus = 3;
--
Gitblit v1.7.1