diff --git a/pom.xml b/pom.xml
index d29292ca4..bb389d57d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,6 +238,8 @@
ruoyi-generator
sino-activity
ruoyi-common
+ sino-act-web
+
pom
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
index eb539034f..9620aef26 100644
--- a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
+++ b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
@@ -3,10 +3,11 @@ package com.ruoyi.web.controller.draw;
import com.ruoyi.web.vo.Const;
import com.ruoyi.web.vo.Result;
import com.ruoyi.web.vo.draw.*;
-import com.sinosoft.activity.domain.ActConfig;
-import com.sinosoft.activity.domain.ActPageConfigGuide;
-import com.sinosoft.activity.domain.DrawConfig;
-import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.domain.*;
+import com.sinosoft.activity.service.IActPageConfigUserinfoService;
+import com.sinosoft.activity.service.IDrawConfigService;
+import com.sinosoft.activity.service.IDrawInfoService;
+import com.sinosoft.activity.service.IDrawTaskNotifyService;
import com.sinosoft.activity.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -53,6 +54,11 @@ public class DrawController {
private IActPageConfigGuideService actPageConfigGuideService;
@Autowired
private IActConfigService actConfigService;
+ @Autowired
+ private IActPageConfigSubscribeService iActPageConfigSubscribeService;
+
+ @Autowired
+ private IActPageConfigUserinfoService iActPageConfigUserinfoService;
private WxOAuth2UserInfo getUserInfo(HttpServletRequest request, String code) throws Exception {
// if (!this.wxService.switchover(appid)) {
@@ -204,6 +210,23 @@ public class DrawController {
return result;
}
+ @RequestMapping(value="/info.action", method = RequestMethod.POST)
+ @ResponseBody
+ public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) {
+ ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
+ logger.info("活动编码"+drawCode);
+ try{
+ List prizes = new ArrayList();
+ ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode);
+ prizes.add(actPageConfigUserinfo);
+ result.setActPageConfigUserinfo(prizes);
+ }catch (Exception e){
+ result.setRespCode("-1");
+ result.setRespMsg("系统异常，请稍后再试");
+ logger.error("DrawController.prizes ex: ", e);
+ }
+ return result;
+ }
@RequestMapping(value="/prizes.action", method = RequestMethod.POST)
@ResponseBody
public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) {
@@ -383,5 +406,32 @@ public class DrawController {
return result;
}
+ /**
+ * 获取活动配置展示信息，根据活动编码
+ *
+ * @param request
+ * @param actCode
+ * @return
+ */
+ @ApiOperation("获取二维码信息")
+ @ApiImplicitParam(name = "actCode", value = "活动编码", required = true, dataType = "string", paramType = "path")
+ @RequestMapping(value="/qrCode", method = RequestMethod.POST)
+ @ResponseBody
+ public ActPageConfigSubscribeResult qrcode(HttpServletRequest request, String actCode) {
+ ActPageConfigSubscribeResult result = new ActPageConfigSubscribeResult ();
+ try {
+ List list = new ArrayList<>();
+
+ ActPageConfigSubscribe subscribe = iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(actCode);
+ list.add(subscribe);
+ result.setActPageConfigSubscribe(list);
+ }catch (Exception e){
+ result.setRespCode("-1");
+ result.setRespMsg("系统异常，请稍后再试");
+ logger.error("DrawController.saveAddress ex: ", e);
+ }
+ return result;
+ }
+
}
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java
new file mode 100644
index 000000000..beadd88c2
--- /dev/null
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java
@@ -0,0 +1,18 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+
+import java.util.List;
+
+public class ActPageConfigSubscribeResult extends Result {
+ private List actPageConfigSubscribe;
+
+ public List getActPageConfigSubscribe() {
+ return actPageConfigSubscribe;
+ }
+
+ public void setActPageConfigSubscribe(List actPageConfigSubscribe) {
+ this.actPageConfigSubscribe = actPageConfigSubscribe;
+ }
+}
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java
new file mode 100644
index 000000000..2e06b5161
--- /dev/null
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java
@@ -0,0 +1,21 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+
+import java.util.List;
+
+
+public class ActPageConfigUserinfoResult extends Result
+{
+
+ private List actPageConfigUserinfo;
+
+ public List getActPageConfigUserinfo() {
+ return actPageConfigUserinfo;
+ }
+
+ public void setActPageConfigUserinfo(List actPageConfigUserinfo) {
+ this.actPageConfigUserinfo = actPageConfigUserinfo;
+ }
+}
diff --git a/sino-act-web/src/main/resources/public/draw/qrCode.html b/sino-act-web/src/main/resources/public/draw/qrCode.html
new file mode 100644
index 000000000..a09ceda19
--- /dev/null
+++ b/sino-act-web/src/main/resources/public/draw/qrCode.html
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+ 活动
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+