From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
index df9947e..51e7060 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
@@ -5,15 +5,14 @@
import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
+import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper;
import com.panzhihua.service_dangjian.entity.ComActIntegralUser;
import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
-import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService;
-import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService;
-import com.panzhihua.service_dangjian.service.ComActIntegralUsersService;
-import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService;
+import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
+import com.panzhihua.service_dangjian.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -40,6 +39,9 @@
@Resource
private NewFightIntegratingTaskService taskService;
+
+ @Resource
+ private NewFightConvenientMerchantService merchantService;
@Override
@@ -102,11 +104,31 @@
{
case "9":
//商城积分兑换
- item.setAddOrReduce(2);
+ //积分总数加减
break;
case "10":
- //商家线下积分兑换
- item.setAddOrReduce(2);
+ //商家线下积分兑换 增加
+ //商家积分增加
+ NewFightConvenientMerchant merchant=merchantService.selectMerchantById(item.getMerchantId());
+ int allMoney=0;
+ if(!StringUtils.isEmpty(merchant.getBusinessCredit()))
+ {
+ allMoney=Integer.valueOf(merchant.getBusinessCredit());
+ }
+ if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.add)
+ {
+ allMoney=allMoney+Integer.valueOf(item.getIntegralNum());
+
+ }
+ else
+ {
+ //商家积分减少
+ allMoney=allMoney-Integer.valueOf(item.getIntegralNum());
+ }
+ NewFightConvenientMerchantVO merchantVO=new NewFightConvenientMerchantVO();
+ merchantVO.setId(merchant.getId());
+ merchantVO.setBusinessCredit(allMoney+"");
+ merchantService.editData(merchantVO);
break;
case "11":
//花城登录
@@ -136,23 +158,26 @@
//15查看微心愿
case "16":
//查看随手拍
-// item.setAddOrReduce(1);
-// item.setIntegralNum("1");
-// break;
- case "17":
- //每日签到
- IntegratingTask task2=taskService.getDetails(item.getUserId(),
- item.getCommunityId(),item.getType());
- if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) )
- {
- return R.ok();
- }
item.setAddOrReduce(1);
item.setIntegralNum("1");
IntegratingTaskVO taskVO2=new IntegratingTaskVO();
taskVO2.setIsDraw("2");
taskVO2.setId(item.getTaskId());
taskService.editData(taskVO2);
+ break;
+ case "17":
+ //每日签到
+// IntegratingTask task2=taskService.getDetails(item.getUserId(),
+// item.getCommunityId(),item.getType());
+// if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) )
+// {
+// return R.ok();
+// }
+ item.setAddOrReduce(1);
+// IntegratingTaskVO taskVO2=new IntegratingTaskVO();
+// taskVO2.setIsDraw("2");
+// taskVO2.setId(item.getTaskId());
+// taskService.editData(taskVO2);
break;
case "18":
//上传“随手拍”或“微心愿
@@ -211,7 +236,7 @@
//积分总数加减
if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce)
{
- integralUserDO.setIntegralSum(addIntegral(integralSum - amount));
+// integralUserDO.setIntegralSum(addIntegral(integralSum - amount));
integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - amount));
}
else {
--
Gitblit v1.7.1