From 25ef12504f10cb066db53541bd7bc7bac4c09ac4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 11 七月 2023 18:39:10 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
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 01d4970..e36ea82 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
@@ -1056,7 +1056,6 @@
}else{
merVerifyAwardVo.setGiftFrom("商户生日卡");
}
-
merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
List<BirthdayGiftSendDto> giftSendDtoList = new ArrayList<>();
BirthdayGiftSendDto birthdayGiftSendDto = new BirthdayGiftSendDto();
@@ -1107,6 +1106,17 @@
break;
}
merVerifyAwardVo.setCreateTime(memberGiftRecord.getCreateTime());
+ memberGiftRecord.setVerifyStatus(2);
+ memberGiftRecord.setVerifyTime(new Date());
+ if(member.getBindingFlag()!=1){
+ AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
+ appMemberBindingDto.setBindingFlag(1);
+ appMemberBindingDto.setShopId(merVerifyPrizeDto.getShopId());
+ Shop shop = remoteShopService.getShop(merVerifyPrizeDto.getShopId()).getData();
+ appMemberBindingDto.setShopName(shop.getShopName());
+ appMemberBindingDto.setUserId(merVerifyPrizeDto.getUserId());
+ remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ }
return merVerifyAwardVo;
}
--
Gitblit v1.7.1