diff --git a/src/main/java/com/jmfy/controller/CdkInfoController.java b/src/main/java/com/jmfy/controller/CdkInfoController.java index 768f1c7..9c1e234 100644 --- a/src/main/java/com/jmfy/controller/CdkInfoController.java +++ b/src/main/java/com/jmfy/controller/CdkInfoController.java @@ -2,6 +2,7 @@ package com.jmfy.controller; import com.jmfy.dao.CdkInfoDao; import com.jmfy.dao.UserInfoDao; +import com.jmfy.dao.impl.GSUserDaoImpl; import com.jmfy.model.*; import com.jmfy.model.vo.CDKInfoVo; import com.jmfy.model.vo.UseCDKInfoVo; @@ -22,18 +23,18 @@ import javax.servlet.http.HttpSession; import java.io.*; import java.util.*; -/** - * Created by huangds on 2017/10/24. - */ @Controller public class CdkInfoController { @Resource private CdkInfoDao cdkInfoDao; @Resource - private UserInfoDao userInfoDao; + private GSUserDaoImpl gsUserDao; @Resource private SeqUtils seqUtils; + /** + * 生成序列号 + */ @RequestMapping(value = "/addCdkNumber", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int addCdkNumber(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); @@ -51,7 +52,7 @@ public class CdkInfoController { } for (int i = 0; i < scdkInfo.getGoodsSum(); i++) { long nowTime = System.currentTimeMillis(); - String sdk = "YSJCDK" + goodsId + nowTime + UUID.randomUUID().toString(); + String sdk = "JLCDK" + goodsId + nowTime + UUID.randomUUID().toString(); String id = MD5Util.encrypByMd5(sdk); CdkInfo cdkInfo = new CdkInfo(); cdkInfo.setId(id); @@ -63,6 +64,7 @@ public class CdkInfoController { cdkInfoDao.updateCdkGoodsInfo(scdkInfo,goodsId); return 0; } + @RequestMapping(value = "/findCdkInfo", method = {RequestMethod.POST, RequestMethod.GET}) public String findCdkInfo (HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); @@ -70,11 +72,11 @@ public class CdkInfoController { String cdkNum = parameterMap.get("cdkNum"); CdkInfo cdkInfo = cdkInfoDao.findCdkInfoBuyId(cdkNum); if (cdkInfo == null){ - return "404"; + return "useCDKinfo"; } SCdkInfo scdkInfo = cdkInfoDao.getScdkInfo(cdkInfo.getGoodsId()); if (scdkInfo == null){ - return "404"; + return "useCDKinfo"; } List cdkUseInfoList = cdkInfoDao.findCdkUseInfoById(serverId,cdkNum); List useCDKInfoVoList = new ArrayList<>(); @@ -82,10 +84,9 @@ public class CdkInfoController { UseCDKInfoVo useCDKInfoVo = new UseCDKInfoVo(); useCDKInfoVo.setIsData(1); useCDKInfoVo.setUserId(cdkUseInfo.getUid()); - CUser cUser = userInfoDao.findCuserInfo(cdkUseInfo.getServerId(), cdkUseInfo.getUid()); - useCDKInfoVo.setUserName(cUser.getUserName()); - CUserInfo cUserInfo = userInfoDao.findUserInfoByUserId(cdkUseInfo.getUid()); - useCDKInfoVo.setOpenId(cUserInfo.getOpenId()); + GSUser gsUser = gsUserDao.findUserInfo(cdkUseInfo.getServerId(), cdkUseInfo.getUid()); + useCDKInfoVo.setUserName(gsUser.getPlayerManager().getNickName()); + useCDKInfoVo.setOpenId(gsUser.getPlayerManager().getOpenId()); useCDKInfoVo.setGoodsName(scdkInfo.getGoodsName()); useCDKInfoVo.setUseTime(JsonUtil.timeStamp2Date(String.valueOf(cdkUseInfo.getCreateTime()))); useCDKInfoVoList.add(useCDKInfoVo); @@ -93,6 +94,10 @@ public class CdkInfoController { map.put("useCDKinfo",useCDKInfoVoList); return "useCDKinfo"; } + + /** + * 礼包信息 + */ @RequestMapping(value = "/toCDKBuild", method = {RequestMethod.POST, RequestMethod.GET}) public String toCDKBuild (HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { List sCdkInfoList = cdkInfoDao.getScdkInfoList(); @@ -108,22 +113,15 @@ public class CdkInfoController { cdkInfoVo.setGoodsNum(sCdkInfo.getGoodsSum()); long useNum = cdkInfoDao.getUseCdkNumByGoodsId(sCdkInfo.getId()); cdkInfoVo.setUseNum(useNum); - cdkInfoVo.setType(getUsetype(sCdkInfo)); + cdkInfoVo.setType(String.valueOf(sCdkInfo.getUsetype())); + cdkInfoVo.setPid(sCdkInfo.getPid()); + cdkInfoVo.setRoleUseNum(sCdkInfo.getRoleUseNum()); sCdkInfoListVo.add(cdkInfoVo); } map.put("sCdkInfoList",sCdkInfoListVo); return "CDKBuild"; } - private String getUsetype(SCdkInfo sCdkInfo) { - String type = "C"; - if (sCdkInfo.getUsetype() ==0){ - type = "A"; - }else if (sCdkInfo.getUsetype() ==1){ - type = "B"; - } - return type ; - } @RequestMapping(value = "/downloadFile", method = {RequestMethod.POST, RequestMethod.GET}) public ResponseEntity downloadFile (HttpSession session, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -146,9 +144,15 @@ public class CdkInfoController { File file = new File(path); return TXTUtils.buildResponseEntity(file); } + + /** + * 生成礼包 + */ @RequestMapping(value = "/addCdkGoodsInfo", method = {RequestMethod.POST, RequestMethod.GET}) public String addCdkGoodsInfo(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String pid = parameterMap.get("pid"); + String roleUseNum = parameterMap.get("roleUseNum"); String goodsName = parameterMap.get("goodsName"); String addType = parameterMap.get("addType"); String goodsNum = parameterMap.get("goodsNum"); @@ -169,6 +173,8 @@ public class CdkInfoController { sCdkInfo.setStartTime(Long.parseLong(startTime)); sCdkInfo.setEndTime(Long.parseLong(endTime)); sCdkInfo.setIsAdd(0); + sCdkInfo.setPid(Integer.parseInt(pid)); + sCdkInfo.setRoleUseNum(Integer.parseInt(roleUseNum)); cdkInfoDao.addCDKGoodsInfo(sCdkInfo); return "redirect:/toCDKBuild"; } diff --git a/src/main/java/com/jmfy/controller/QuestionController.java b/src/main/java/com/jmfy/controller/QuestionController.java index 8866079..acfbd31 100644 --- a/src/main/java/com/jmfy/controller/QuestionController.java +++ b/src/main/java/com/jmfy/controller/QuestionController.java @@ -40,8 +40,7 @@ public class QuestionController { private static final DateFormat ymdhmsFormat_new = new SimpleDateFormat("yyyyMMddHHmm"); @RequestMapping(value = "/updataQuest", method = {RequestMethod.POST, RequestMethod.GET}) - public @ResponseBody - int sendNotice(HttpSession session, HttpServletRequest request) throws Exception { + public @ResponseBody int sendNotice(HttpSession session, HttpServletRequest request) throws Exception { List allServerInfo = serverInfoDao.getAllServerInfo(); List serverList = new ArrayList<>(); @@ -112,18 +111,14 @@ public class QuestionController { return null; } for (int i = 0; i < questions.length; i++) { - if (questiontype[i].equals("2")) { - continue; - } else { - int j = i + 1; - String index = "questiontype_" + j + "_select"; - CQuestionOptionBean cQuestionOptionBean = new CQuestionOptionBean(); - cQuestionOptionBean.setType(Integer.valueOf(questiontype[i])); - cQuestionOptionBean.setAnswerType(Integer.valueOf(answertype[i])); - cQuestionOptionBean.setContent(questions[i]); - cQuestionOptionBean.setOptions(paramMap.get(index)); - cQuestion.getcQuestionOptionBeans().add(cQuestionOptionBean); - } + int j = i + 1; + String index = "questiontype_" + j + "_select"; + CQuestionOptionBean cQuestionOptionBean = new CQuestionOptionBean(); + cQuestionOptionBean.setType(Integer.valueOf(questiontype[i])); + cQuestionOptionBean.setAnswerType(Integer.valueOf(answertype[i])); + cQuestionOptionBean.setContent(questions[i]); + cQuestionOptionBean.setOptions(paramMap.get(index)); + cQuestion.getcQuestionOptionBeans().add(cQuestionOptionBean); } return cQuestion; } diff --git a/src/main/java/com/jmfy/model/SCdkInfo.java b/src/main/java/com/jmfy/model/SCdkInfo.java index 8eeb8dd..257716b 100644 --- a/src/main/java/com/jmfy/model/SCdkInfo.java +++ b/src/main/java/com/jmfy/model/SCdkInfo.java @@ -9,13 +9,18 @@ public class SCdkInfo { @Id private int id; //所属的商品id /** - * 0:同一批禮包序號,同角色不可重複兌換。每組序號限兌換一次。 - * 1:同一批禮包序號,同角色可重複兌換。每組序號限兌換一次。 - * 2: 萬用序號,只出一組序號,可重複使用,每一帳號(一個賬號可能有多個角色)僅限兌換一次。 + * 0:兌換一次。 + * 1:兌換多次。 */ @Field(value = "usetype") private int usetype; + @Field(value = "pid") + private int pid; + + @Field(value = "role_use_num") + private int roleUseNum; + @Field(value = "start_time") private long startTime; @@ -44,6 +49,7 @@ public class SCdkInfo { public void setId(int id) { this.id = id; } + public int getUsetype() { return usetype; } @@ -107,5 +113,21 @@ public class SCdkInfo { public void setIsAdd(int isAdd) { this.isAdd = isAdd; } + + public int getPid() { + return pid; + } + + public void setPid(int pid) { + this.pid = pid; + } + + public int getRoleUseNum() { + return roleUseNum; + } + + public void setRoleUseNum(int roleUseNum) { + this.roleUseNum = roleUseNum; + } } diff --git a/src/main/java/com/jmfy/model/vo/CDKInfoVo.java b/src/main/java/com/jmfy/model/vo/CDKInfoVo.java index 376a908..23d2877 100644 --- a/src/main/java/com/jmfy/model/vo/CDKInfoVo.java +++ b/src/main/java/com/jmfy/model/vo/CDKInfoVo.java @@ -18,6 +18,10 @@ public class CDKInfoVo { public String type ; // 类型 + public long roleUseNum ; // 被使用数量 + + public int pid ; // pid + public void setId(int id) { this.id = id; } @@ -49,4 +53,12 @@ public class CDKInfoVo { public void setType(String type) { this.type = type; } + + public void setPid(int pid) { + this.pid = pid; + } + + public void setRoleUseNum(long roleUseNum) { + this.roleUseNum = roleUseNum; + } } diff --git a/src/main/java/com/jmfy/utils/JsonUtil.java b/src/main/java/com/jmfy/utils/JsonUtil.java index 71586a9..219c082 100644 --- a/src/main/java/com/jmfy/utils/JsonUtil.java +++ b/src/main/java/com/jmfy/utils/JsonUtil.java @@ -51,18 +51,18 @@ public class JsonUtil { StringBuilder reward = new StringBuilder(); String[] itemIds = request.getParameterValues("itemIds[]"); String[] itemNums = request.getParameterValues("itemNums[]"); - String[] itemTypes = request.getParameterValues("itemTypes[]"); - if (itemIds.length ==0 || itemNums.length ==0 || itemTypes.length ==0){ + + if (itemIds.length ==0 || itemNums.length ==0 ){ return reward.toString(); } for (int i = 0; i < itemIds.length; i++){ - if (itemIds[i].isEmpty() || itemNums[i].isEmpty() || itemTypes[i].isEmpty()){ + if (itemIds[i].isEmpty() || itemNums[i].isEmpty()){ return reward.toString(); } if (reward.length() == 0){ - reward = new StringBuilder(itemIds[i] + "#" + itemNums[i] + "#" + itemTypes[i]); + reward = new StringBuilder(itemIds[i] + "#" + itemNums[i] ); }else{ - reward.append("|").append(itemIds[i]).append("#").append(itemNums[i]).append("#").append(itemTypes[i]); + reward.append("|").append(itemIds[i]).append("#").append(itemNums[i]).append("#"); } } return reward.toString(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 14efa41..2024d6e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,7 +11,7 @@ spring.data.gameMongodb.uri = mongodb://60.1.1.14:27017 # redis config -spring.redis.database=13 +spring.redis.database=0 spring.redis.host = 60.1.1.21 spring.redis.port = 6379 spring.redis.password = diff --git a/src/main/resources/static/html/sendSysMSG.html b/src/main/resources/static/html/sendSysMSG.html index d1b6f7b..f610477 100644 --- a/src/main/resources/static/html/sendSysMSG.html +++ b/src/main/resources/static/html/sendSysMSG.html @@ -36,7 +36,7 @@
-
- + @@ -95,7 +95,7 @@ $(function(){ }); }); -$('#updataQuest').load(function () { +$('#updataMSGQuest').load(function () { // 根据后台返回值处理结果 var text=$(this).contents().find("body").text(); if (text != 0) { diff --git a/src/main/resources/static/html/sendSysNotice.html b/src/main/resources/static/html/sendSysNotice.html index c07cf63..07e853f 100644 --- a/src/main/resources/static/html/sendSysNotice.html +++ b/src/main/resources/static/html/sendSysNotice.html @@ -36,7 +36,7 @@
-
- + @@ -95,7 +95,7 @@ $(function(){ }); }); -$('#updataQuest').load(function () { +$('#updataSYSQuest').load(function () { // 根据后台返回值处理结果 var text=$(this).contents().find("body").text(); if (text != 0) { diff --git a/src/main/resources/static/html/toAddCDKGoods.html b/src/main/resources/static/html/toAddCDKGoods.html index e3659ad..babb9f9 100644 --- a/src/main/resources/static/html/toAddCDKGoods.html +++ b/src/main/resources/static/html/toAddCDKGoods.html @@ -39,6 +39,7 @@
序列号礼包生成
+
-
- -
- - -
-
+