From 21db21a114356e0704a3483c1a3f22b96ea6658b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 16:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
index b7136e7..e350639 100644
--- a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
+++ b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
@@ -1,9 +1,18 @@
package com.matrix;
+import com.alibaba.fastjson.JSON;
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
+import com.matrix.system.activity.entity.ActivitySignAwardSet;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.score.constant.ScoreSettingConstant;
+import com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo;
+import com.matrix.system.shopXcx.api.vo.SignBasicInfoJsonVo;
+import com.matrix.system.shopXcx.api.vo.SignBasicInfoVo;
+import com.matrix.system.shopXcx.bean.ShopActivities;
+import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,13 +28,40 @@
@Autowired
private BusParameterSettingsDao busParameterSettingsDao;
-
- @Test
+ @Autowired
+ private ShopActivitiesDao shopActivitiesDao;
+ @Autowired
+ private ActivitySignAwardSetDao activitySignAwardSetDao;
+
+
+ @Test
+ public void getSignBasicInfo() {
+ Long companyId = 36L;
+ //获取签到活动的信息
+ SignBasicInfoVo signBasicInfoVo = new SignBasicInfoVo();
+ ShopActivities shopActivities = shopActivitiesDao.selectOneByCompanyIdAndActTypeAndActStatus(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN,ShopActivities.ACTSTATUS_STATUS_ING);
+ Long actId = shopActivities.getId();
+ signBasicInfoVo.setActName(shopActivities.getActName());
+ signBasicInfoVo.setActCode(shopActivities.getActCode());
+ signBasicInfoVo.setId(shopActivities.getId());
+ String actContent = shopActivities.getActContent();
+ SignBasicInfoJsonVo signBasicInfoJsonVo = JSON.parseObject(actContent, SignBasicInfoJsonVo.class);
+ signBasicInfoVo.setSignBasicInfoJsonVo(signBasicInfoJsonVo);
+
+ List<ActivitySignAwardSetVo> activitySignAwardSetVos = activitySignAwardSetDao
+ .selectListByActIDAndCompanyId(actId,companyId, ActivitySignAwardSet.AWARDSTATE_WORK);
+ signBasicInfoVo.setActivitySignAwardSetVos(activitySignAwardSetVos);
+
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");
+ ajaxResult.setData(signBasicInfoVo);
+ System.out.println(signBasicInfoVo);
+
+ }
public void InitByCompanyId() {
//对应的公司ID
- long companyId = 35L;
- initBusParameterSetting(companyId);
- initBusParameterFenxiaoSetting(companyId);
+// long companyId = 36L;
+// initBusParameterSetting(companyId);
+// //initBusParameterFenxiaoSetting(companyId);
}
/**
@@ -47,7 +83,7 @@
ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.CASH_CONSUMPTION_SHOP, companyId));
ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.RESERVATION_SERVICE_SHOP, companyId));
ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.EVALUATUIN_ORDER_SHOP, companyId));
- //ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.SIGN_SHOP, companyId));
+ ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.SIGN_SHOP, companyId));
busParameterSettingsDao.batchInsert(ruleSettings);
}
--
Gitblit v1.9.1