From 22d199559342c1ccb3a0a8a5b5ee50e973819e16 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 19 一月 2024 11:31:19 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-再生俱乐部
---
phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java
index 76f71c1..159c22a 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/service/market/impl/MarketActivityServiceImpl.java
@@ -76,15 +76,16 @@
//閬嶅巻棰嗗彇
String couponName = "";
- Integer isApprove = null;
+ Integer isApprove = BaseEntity.NO;
for(MarketActivityItem activityCoupon : list)
{
//鏂板
recordItem = new MarketActivityReceiveRecordItem(activityCoupon);
recordItemList.add(recordItem);
+ //鑾峰彇浼樻儬鍒稿悕绉�
+ couponName = activityCoupon.getCommonName();
//鍒ゆ柇鏄惁闇�瑕佸鎵癸紝濡傛灉闇�瑕佸鎵瑰厛璺宠繃涓嶅彂鏀句紭鎯犲埜
if(activityCoupon.getIsApprove() == BaseEntity.YES){
- couponName = activityCoupon.getCommonName();
isApprove = activityCoupon.getIsApprove();
continue;
}
@@ -137,7 +138,7 @@
}
//鍙戦�佸鎵归�氱煡缁欐椿鍔ㄨ礋璐ｄ汉-------------------------------------------------------------------------------------
- if(isApprove == BaseEntity.YES) {
+// if(isApprove == BaseEntity.YES) {
try {
String empUserId;
Shop shop = commonService.selectOneByKey(ShopMapper.class, receiveRecord.getOpShopId());
@@ -153,7 +154,7 @@
empUserId = "18023612893";
}
- String sendDate = MessageTemplate.receiveCouponSendToManager(empUserId, user.getName(), receiveRecord.getOpName(), shop.getName(), marketActivity.getTitle(), couponName, customParameter.getCorpMpAppId());
+ String sendDate = MessageTemplate.receiveCouponSendToManager(isApprove,empUserId, user.getName(), receiveRecord.getOpName(), shop.getName(), marketActivity.getTitle(), couponName, customParameter.getCorpMpAppId());
log.info("灏忕▼搴忚惀閿�娲诲姩棰嗗彇浼樻儬鍒搁�氱煡娲诲姩璐熻矗浜猴紝userId涓�:{}", empUserId);
String token = WeiXinCorpMpUtil.getApplicationAccessToken(commonService, customParameter.getCorpAppId(), customParameter.getCorpMpSecret());
SendMessageTool.sendMessge(sendDate, token);
@@ -161,7 +162,7 @@
log.info("灏忕▼搴忕敤鎴疯惀閿�娲诲姩鍙戦�侀�氱煡澶辫触");
log.info(GlobalExceptionHandler.getExceptionInformation(e));
}
- }
+// }
//-------------------------------------------------------------------------------------------
}
--
Gitblit v1.8.0