From 4154f86d5c2c5e8db4e1f37495f750a18c43a822 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Wed, 21 Apr 2021 14:31:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=BD=E5=B0=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=92=AD=E6=8A=A5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/draw/DrawController.java | 114 +++++--------- .../com/ruoyi/web/vo/draw/PrizeResult.java | 11 ++ .../main/resources/public/draw/css/goods.css | 15 ++ .../src/main/resources/public/draw/js/draw.js | 56 ++++--- .../resources/public/draw/scratchcard.html | 143 +++++++++--------- .../main/resources/public/draw/turntable.html | 11 +- .../sinosoft/activity/domain/DrawRecord.java | 12 +- .../activity/mapper/DrawRecordMapper.java | 16 ++ .../activity/service/IDrawRecordService.java | 2 + .../service/impl/DrawRecordServiceImpl.java | 9 ++ .../mapper/activity/DrawRecordMapper.xml | 29 +++- 11 files changed, 239 insertions(+), 179 deletions(-) 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 078860a57..877806115 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 @@ -1,8 +1,7 @@ package com.ruoyi.web.controller.draw; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.dto.DrawActivityRequest; -import com.ruoyi.web.vo.Const; +import com.ruoyi.dto.*; import com.ruoyi.web.vo.Result; import com.ruoyi.web.vo.draw.*; import com.sinosoft.activity.domain.DrawConfig; @@ -12,6 +11,7 @@ import com.sinosoft.activity.service.IDrawConfigService; import com.sinosoft.activity.service.IDrawInfoService; import com.sinosoft.activity.service.IDrawTaskNotifyService; import com.sinosoft.activity.service.*; +import com.sinosoft.activity.service.impl.ActPageConfigUserinfoServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; import me.chanjar.weixin.mp.api.WxMpService; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -58,11 +58,18 @@ public class DrawController { @Autowired private IActConfigService actConfigService; @Autowired + private ActPageConfigUserinfoServiceImpl actPageConfigUserinfoServiceImpl; + @Autowired private IActPageConfigSubscribeService iActPageConfigSubscribeService; @Autowired private IActPageConfigUserinfoService iActPageConfigUserinfoService; @Autowired + private IDrawRecordService iDrawRecordService; + + @Autowired + private IDrawUserInfoService iDrawUserInfoService; + @Autowired private IDrawTaskNotifyService taskNotifyService; @Autowired private IDrawRuleService drawRuleService; @@ -174,12 +181,12 @@ public class DrawController { @RequestMapping(value="/info.action", method = RequestMethod.POST) @ResponseBody - public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) { + public ActPageConfigUserinfoResult info(HttpServletRequest request, String actCode) { ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult(); - logger.info("活动编码"+drawCode); + logger.info("活动编码"+actCode); try{ List prizes = new ArrayList(); - ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode); + ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(actCode); prizes.add(actPageConfigUserinfo); result.setActPageConfigUserinfo(prizes); }catch (Exception e){ @@ -193,51 +200,28 @@ public class DrawController { @ResponseBody public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) { PrizeResult result = new PrizeResult(); - List prizes = new ArrayList(); + List prizes = new ArrayList(); try { + HttpSession session = request.getSession(); WxOAuth2UserInfo userInfo = getUserInfo(request, null); - if (userInfo == null && !"1".equals(isAll)) { - result.setPrizes(prizes); + /* if (userInfo == null && !"1".equals(isAll)) { + result.setRecord(prizes); return result; - } - String userId = null; - if (!"1".equals(isAll)) { + }*/ + String userId ="1328495419744"; + /* if (!"1".equals(isAll)) { + Long userId1 = ShiroUtils.getUserId(); userId = userInfo.getOpenid(); + }*/ + List drawRecords = iDrawRecordService.selectDrawRecordCodeList(drawCode, userId); + for (DrawRecord draw: drawRecords) { + String mobile = draw.getPHONE(); + if (StringUtils.isNotBlank(mobile)) { + draw.setPHONE(mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length())); + } } -// AwardPrizeListResponse awardPrizeListResponse = activityService.awardPrizeList(drawCode, userId).get_return(); -// AwardPrizeListResponseHeader header = awardPrizeListResponse.getHeader(); -// result.setRespCode(header.getResultCode()); -// result.setRespMsg(header.getResultInfo()); -// AwardPrizeListResponseBody responseBody = awardPrizeListResponse.getResponseBody(); -// AwardPrizeList[] awardPrizes = responseBody.getAwardPrizeLists(); -// if (awardPrizes != null) { -// for (int i = 0; i < awardPrizes.length; i++) { -// AwardPrizeList awardPrize = awardPrizes[i]; -// Prize prize = new Prize(); -// prize.setPrizeCode(awardPrize.getPrizeCode()); -// prize.setPrizeName(awardPrize.getPrizeName()); -// prize.setPrizeType(awardPrize.getPrizeType()); -// prize.setDrawTime(DateUtil.convertDate(DateUtil.convertStringToDate(awardPrize.getDrawTime(), DateUtil.YYYYMMDDHHMMSSS), "yyyy/MM/dd HH:mm")); -// prize.setStatus(awardPrize.getStatus()); -// prize.setExtId(awardPrize.getExtId()); -// prize.setGatewayFlow(awardPrize.getGatewayFolw()); -// String userName = awardPrize.getUserName(); -// if (StringUtils.isNotBlank(userName)) { -// int end = 1; -// if (userName.length()==2) { -// end = 0; -// } -// prize.setUserName(StringUtil.getStarString2(userName, 1, end)); -// } -// String mobile = awardPrize.getMobile(); -// if (StringUtils.isNotBlank(mobile)) { -// prize.setMobile(StringUtil.getStarString2(mobile, 3, 4)); -// } -// prizes.add(prize); -// } -// } - result.setPrizes(prizes); + result.setRecord(drawRecords); } catch (Exception e) { result.setRespCode("-1"); result.setRespMsg("系统异常，请稍后再试"); @@ -309,42 +293,13 @@ public class DrawController { } return result; } - @RequestMapping(value="/saveAddress.action", method = RequestMethod.POST) + @RequestMapping(value="/saveAddress", method = RequestMethod.POST) @ResponseBody - public Result saveAddress(HttpServletRequest request, String drawCode, String uname, String phone, String addr, String flow) { + public Result saveAddress(HttpServletRequest request, DrawUserInfo userInfo) { Result result = new Result(); try { - HttpSession session = request.getSession(); - WxOAuth2UserInfo userInfo = getUserInfo(request, null); - if (userInfo == null) { - result.setRespCode("-2"); - result.setRespMsg("会话已失效，请重新登录"); - logger.info("DrawController.saveAddress userId is null"); - return result; - } - if (StringUtils.isBlank(uname)) { - result.setRespCode("-4"); - result.setRespMsg("请输入姓名"); - return result; - } -// String validateMobile = CommonValidate.validateMobile(phone, "1"); -// if (StringUtils.isNotBlank(validateMobile)) { -// result.setRespCode("-4"); -// result.setRespMsg(validateMobile); -// return result; -// } - String userId = userInfo.getOpenid(); -// SaveUserAddressRequestBody requestBody = new SaveUserAddressRequestBody(); -// requestBody.setDrawCode(drawCode); -// requestBody.setGatewayFlow(flow); -// requestBody.setUserId(userId); -// requestBody.setUserName(uname); -// requestBody.setPhone(phone); -// requestBody.setAddress(addr); -// //实物留资 -// requestBody.setNotifyType("007"); -// requestBody.setCity("无"); -// activityService.saveUserAddress(requestBody); + userInfo.setCreateTime(new Date()); + iDrawUserInfoService.insertDrawUserInfo(userInfo); } catch (Exception e) { result.setRespCode("-1"); result.setRespMsg("系统异常，请稍后再试"); @@ -410,7 +365,7 @@ public class DrawController { }catch (Exception e){ result.setRespCode("-1"); result.setRespMsg("系统异常，请稍后再试"); - logger.error("DrawController.saveAddress ex: ", e); + logger.error("DrawController.qrCode ex: ", e); } return result; } @@ -431,5 +386,4 @@ public class DrawController { return result; } - } diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java index e9d943095..37b2ce08e 100644 --- a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java +++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java @@ -1,12 +1,15 @@ package com.ruoyi.web.vo.draw; import com.ruoyi.web.vo.Result; +import com.sinosoft.activity.domain.DrawRecord; import java.util.List; public class PrizeResult extends Result { private List prizes; + private List record; + public List getPrizes() { return prizes; } @@ -14,4 +17,12 @@ public class PrizeResult extends Result { public void setPrizes(List prizes) { this.prizes = prizes; } + + public List getRecord() { + return record; + } + + public void setRecord(List record) { + this.record = record; + } } diff --git a/sino-act-web/src/main/resources/public/draw/css/goods.css b/sino-act-web/src/main/resources/public/draw/css/goods.css index ecf492d1c..d26b2c5e5 100644 --- a/sino-act-web/src/main/resources/public/draw/css/goods.css +++ b/sino-act-web/src/main/resources/public/draw/css/goods.css @@ -71,4 +71,19 @@ margin-top:10px; outline: none; line-height:20px; +} +.button { /* 按钮美化 */ + width: 40px; /* 宽度 */ + height: 30px; /* 高度 */ + border-width: 0px; /* 边框宽度 */ + border-radius: 3px; /* 边框半径 */ + background: #d1d1d1; /* 背景颜色 */ + cursor: pointer; /* 鼠标移入按钮范围时出现手势 */ + outline: none; /* 不显示轮廓线 */ + font-family: Microsoft YaHei; /* 设置字体 */ + color: white; /* 字体颜色 */ + font-size: 17px; /* 字体大小 */ +} +.button:hover { /* 鼠标移入按钮范围时改变颜色 */ + background: #5599FF; } \ No newline at end of file diff --git a/sino-act-web/src/main/resources/public/draw/js/draw.js b/sino-act-web/src/main/resources/public/draw/js/draw.js index 43a3e87b4..b024f4466 100644 --- a/sino-act-web/src/main/resources/public/draw/js/draw.js +++ b/sino-act-web/src/main/resources/public/draw/js/draw.js @@ -58,23 +58,23 @@ function myprizes() { data: {drawCode: drawCode}, dataType: "json", success: function(data){ - if (!data.prizes) { + if (!data.record) { return; } - console.log(data.prizes); - $.each(data.prizes, function (i, n) { - var ptype = n.prizeType; + console.log(data.record); + $.each(data.record, function (i, n) { + var ptype = n.prizetype; var status = n.status; var iscenter = 0; - var prize = $('.prize_li').clone(); - $(prize).css('display', 'inherit'); - prize.removeClass('prize_li'); - prize.find('.pname').html(n.prizeName); - prize.find('.time').html(n.drawTime); - $(prize).attr('val', n.prizeCode); - $(prize).attr('flow', n.gatewayFlow); - $(prize).attr('ptype', ptype); - $('.popList').append(prize); + var record = $('.prize_li').clone(); + $(record).css('display', 'inherit'); + record.removeClass('prize_li'); + record.find('.pname').html(n.prizename); + record.find('.time').html(n.createtimestamp); + $(record).attr('val', n.prizecode); + $(record).attr('flow', n.drawtranseqno); + $(record).attr('ptype', n.prizetype); + $('.popList').append(record); }); }, error: function (XMLHttpRequest, textStatus, errorThrown) { @@ -132,10 +132,10 @@ function prizes() { dataType: "json", success: function(data){ var content = ''; - if (data.prizes) { - $.each(data.prizes, function (i, n) { - if (n.mobile) { - content = content + ('
  • 恭喜 '+n.mobile+' 获得'+n.prizeName+'
    • '); + if (data.record) { + $.each(data.record, function (i, n) { + if (n.phone) { + content = content + ('
  • 恭喜 '+n.phone+' 获得'+n.prizename+'
    • '); } }); } @@ -152,6 +152,12 @@ function prizes() { } function saveAddr() { + var boolean = $("#protocol").prop("checked"); + if (!boolean){ + tip('请勾选协议'); + return ; + } + var uname = $('.uname').val(); var phone = $('.phone').val(); var addr = $('.addr').val(); @@ -172,22 +178,26 @@ function saveAddr() { } else { } var flow = $('.flow').val(); - uname = getEntryptPwd(uname); - phone = getEntryptPwd(phone); + /* uname = getEntryptPwd(uname); + phone = getEntryptPwd(phone);*/ + var data = $("#addressId").serialize(); $.ajax({ - type: "POST", - url: contextRootPath+"/draw/saveAddress.action", - data: {drawCode: drawCode, flow:flow, uname: uname, phone: phone, addr: addr}, + url: contextRootPath+"/draw/saveAddress", dataType: "json", + type: "post", + data: data, success: function(data){ if (data.respCode == '1') { if ('integral' == prizeType) { + } else if ('materialObject' == prizeType) { + } else { + } - $('.goods').hide(); $('.register').show(); } else { + $('.register').show(); tip(data.respMsg); } }, diff --git a/sino-act-web/src/main/resources/public/draw/scratchcard.html b/sino-act-web/src/main/resources/public/draw/scratchcard.html index 29a3274ba..8ece012e4 100644 --- a/sino-act-web/src/main/resources/public/draw/scratchcard.html +++ b/sino-act-web/src/main/resources/public/draw/scratchcard.html @@ -4,15 +4,18 @@ - + - ֧񣬺˰ + 支付抽好礼，好运伴随你 + + + @@ -95,16 +64,4 @@ - - \ No newline at end of file From 59e68e4eb7f5a43f495609ae681aabd585a496ee Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Wed, 21 Apr 2021 14:33:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BF=A1=E6=81=AF=E9=A1=B5=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/public/act/address.html | 152 ++++++++++++++++++ .../main/resources/public/act/css/address.css | 124 ++++++++++++++ .../activity/domain/DrawUserInfo.java | 151 +++++++++++++++++ .../activity/mapper/DrawUserInfoMapper.java | 62 +++++++ .../service/IDrawUserInfoService.java | 62 +++++++ .../service/impl/DrawUserInfoServiceImpl.java | 98 +++++++++++ .../mapper/activity/DrawUserInfoMapper.xml | 102 ++++++++++++ 7 files changed, 751 insertions(+) create mode 100644 sino-act-web/src/main/resources/public/act/address.html create mode 100644 sino-act-web/src/main/resources/public/act/css/address.css create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/domain/DrawUserInfo.java create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawUserInfoMapper.java create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/IDrawUserInfoService.java create mode 100644 sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawUserInfoServiceImpl.java create mode 100644 sino-activity/src/main/resources/mapper/activity/DrawUserInfoMapper.xml diff --git a/sino-act-web/src/main/resources/public/act/address.html b/sino-act-web/src/main/resources/public/act/address.html new file mode 100644 index 000000000..773ffc54f --- /dev/null +++ b/sino-act-web/src/main/resources/public/act/address.html @@ -0,0 +1,152 @@ + + + + + + + + 活动 + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    + +
    请填写您的基本信息
    + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/sino-act-web/src/main/resources/public/act/css/address.css b/sino-act-web/src/main/resources/public/act/css/address.css new file mode 100644 index 000000000..85ffc7868 --- /dev/null +++ b/sino-act-web/src/main/resources/public/act/css/address.css @@ -0,0 +1,124 @@ +.address{ + /* opacity:0; + height:0; */ +} +.popupMin{ + width:100%; + margin-left:0%; + height:auto !important; + box-sizing: border-box; + position:relative; + display:flex; + flex-direction: column; + /* max-height:1200px; */ + margin-bottom:56px; +} +.address .cont{ + min-height:400px; + margin-top:-0px; + +} +.address .popCont{ + z-index: 1000; +} +.address .cont{ + background-size: 100% auto; + display:flex; + flex-direction: column; + align-items: center; +} + +.address .cont>div:nth-child(1){ + font-size:23px; + color:#ffe2ab; + text-align:center; + margin-top:20px; +} +.address .cont>div:nth-child(2){ + font-size:17px; + color:#ffe2ab; + text-align:center; + margin-top:9px; + font-weight:bold; + +} +.address .cont>div:nth-child(3){ + font-size:17px; + color:#ffe2ab; + text-align:center; + margin-top:20px; + font-weight:bold; +} +.address .cont>div:nth-child(12){ + font-size:17px; + color:#ffe2ab; + margin-top:15px; + margin-right:35%; + +} +.address .cont>div:nth-child(13){ + font-size:17px; + color:#ffe2ab; + text-align:center; + margin-top:20px; + font-weight:bold; +} +.address .cont>img:last-child{ + width:83%; + height:auto; + object-fit:contain; + margin-top:20px; + margin-bottom:15px; +} +.address .cont>input{ + width:90%; + height:30px; + box-sizing: border-box; + margin:0; + padding:0 15px; + border:1px solid #f2ca77; + border-radius:15px; + background: #fff; + margin-top:12px; +} +.address .cont>textarea{ + width:90% !important; + max-width:90% !important; + min-height:60px; + box-sizing: border-box; + margin:0; + padding:8px 15px; + border:1px solid #f2ca77; + border-radius:15px; + background: #fff; + margin-top:10px; + outline: none; + line-height:20px; +} +.button { /* 按钮美化 */ + width: 40px; /* 宽度 */ + height: 30px; /* 高度 */ + border-width: 0px; /* 边框宽度 */ + border-radius: 3px; /* 边框半径 */ + background: #f43c24; /* 背景颜色 */ + cursor: pointer; /* 鼠标移入按钮范围时出现手势 */ + outline: none; /* 不显示轮廓线 */ + font-family: Microsoft YaHei; /* 设置字体 */ + color: white; /* 字体颜色 */ + font-size: 17px; /* 字体大小 */ + } +.button:hover { /* 鼠标移入按钮范围时改变颜色 */ + background: #5599FF; +} +.button1 { /* 按钮美化 */ + width: 80px; /* 宽度 */ + height: 30px; /* 高度 */ + border-width: 0px; /* 边框宽度 */ + border-radius: 3px; /* 边框半径 */ + background: #fff150; /* 背景颜色 */ + cursor: pointer; /* 鼠标移入按钮范围时出现手势 */ + outline: none; /* 不显示轮廓线 */ + font-family: Microsoft YaHei; /* 设置字体 */ + color: white; /* 字体颜色 */ + font-size: 17px; /* 字体大小 */ +} \ No newline at end of file diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawUserInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawUserInfo.java new file mode 100644 index 000000000..172b37c1b --- /dev/null +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawUserInfo.java @@ -0,0 +1,151 @@ +package com.sinosoft.activity.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户信息收集页面对象 draw_user_info + * + * @author xlh + * @date 2021-04-20 + * + */ +public class DrawUserInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long awarDrecordId; + + /** 姓名 */ + @Excel(name = "姓名") + private String userName; + + /** 手机号 */ + @Excel(name = "手机号") + private String mobile; + + /** 性别 */ + @Excel(name = "性别") + private String gender; + + /** 地址 */ + @Excel(name = "地址") + private String address; + + /** 代理人姓名 */ + @Excel(name = "代理人姓名") + private String agentName; + + /** 代理人手机号 */ + @Excel(name = "代理人手机号") + private String agentMobile; + + /** 代理人性别 */ + @Excel(name = "代理人性别") + private String agentGender; + + /** 代理人工号 */ + @Excel(name = "代理人工号") + private String agentNo; + + public void setAwarDrecordId(Long awarDrecordId) + { + this.awarDrecordId = awarDrecordId; + } + + public Long getAwarDrecordId() + { + return awarDrecordId; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setMobile(String mobile) + { + this.mobile = mobile; + } + + public String getMobile() + { + return mobile; + } + public void setGender(String gender) + { + this.gender = gender; + } + + public String getGender() + { + return gender; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setAgentName(String agentName) + { + this.agentName = agentName; + } + + public String getAgentName() + { + return agentName; + } + public void setAgentMobile(String agentMobile) + { + this.agentMobile = agentMobile; + } + + public String getAgentMobile() + { + return agentMobile; + } + public void setAgentGender(String agentGender) + { + this.agentGender = agentGender; + } + + public String getAgentGender() + { + return agentGender; + } + public void setAgentNo(String agentNo) + { + this.agentNo = agentNo; + } + + public String getAgentNo() + { + return agentNo; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("awarDrecordId", getAwarDrecordId()) + .append("userName", getUserName()) + .append("mobile", getMobile()) + .append("gender", getGender()) + .append("address", getAddress()) + .append("agentName", getAgentName()) + .append("agentMobile", getAgentMobile()) + .append("agentGender", getAgentGender()) + .append("agentNo", getAgentNo()) + .toString(); + } + +} diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawUserInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawUserInfoMapper.java new file mode 100644 index 000000000..5d8386581 --- /dev/null +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawUserInfoMapper.java @@ -0,0 +1,62 @@ +package com.sinosoft.activity.mapper; + +import com.sinosoft.activity.domain.DrawUserInfo; + +import java.util.List; + +/** + * 用户信息收集页面Mapper接口 + * + * @author ruoyi + * @date 2021-04-20 + */ +public interface DrawUserInfoMapper +{ + /** + * 查询用户信息收集页面 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 用户信息收集页面 + */ + public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId); + + /** + * 查询用户信息收集页面列表 + * + * @param drawUserInfo 用户信息收集页面 + * @return 用户信息收集页面集合 + */ + public List selectDrawUserInfoList(DrawUserInfo drawUserInfo); + + /** + * 新增用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + public int insertDrawUserInfo(DrawUserInfo drawUserInfo); + + /** + * 修改用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + public int updateDrawUserInfo(DrawUserInfo drawUserInfo); + + /** + * 删除用户信息收集页面 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 结果 + */ + public int deleteDrawUserInfoById(Long awarDrecordId); + + /** + * 批量删除用户信息收集页面 + * + * @param awarDrecordIds 需要删除的数据ID + * @return 结果 + */ + public int deleteDrawUserInfoByIds(String[] awarDrecordIds); +} \ No newline at end of file diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawUserInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawUserInfoService.java new file mode 100644 index 000000000..d2e0d43d3 --- /dev/null +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawUserInfoService.java @@ -0,0 +1,62 @@ +package com.sinosoft.activity.service; + +import com.sinosoft.activity.domain.DrawUserInfo; + +import java.util.List; + +/** + * 用户信息收集页面Service接口 + * + * @author ruoyi + * @date 2021-04-20 + */ +public interface IDrawUserInfoService +{ + /** + * 查询用户信息收集页面 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 用户信息收集页面 + */ + public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId); + + /** + * 查询用户信息收集页面列表 + * + * @param drawUserInfo 用户信息收集页面 + * @return 用户信息收集页面集合 + */ + public List selectDrawUserInfoList(DrawUserInfo drawUserInfo); + + /** + * 新增用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + public int insertDrawUserInfo(DrawUserInfo drawUserInfo); + + /** + * 修改用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + public int updateDrawUserInfo(DrawUserInfo drawUserInfo); + + /** + * 批量删除用户信息收集页面 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDrawUserInfoByIds(String ids); + + /** + * 删除用户信息收集页面信息 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 结果 + */ + public int deleteDrawUserInfoById(Long awarDrecordId); +} \ No newline at end of file diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawUserInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawUserInfoServiceImpl.java new file mode 100644 index 000000000..8ed4295f2 --- /dev/null +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawUserInfoServiceImpl.java @@ -0,0 +1,98 @@ +package com.sinosoft.activity.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.sinosoft.activity.domain.DrawUserInfo; +import com.sinosoft.activity.mapper.DrawUserInfoMapper; +import com.sinosoft.activity.service.IDrawUserInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户信息收集页面Service业务层处理 + * + * @author ruoyi + * @date 2021-04-20 + */ +@Service +public class DrawUserInfoServiceImpl implements IDrawUserInfoService +{ + @Autowired + private DrawUserInfoMapper drawUserInfoMapper; + + /** + * 查询用户信息收集页面 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 用户信息收集页面 + */ + @Override + public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId) + { + return drawUserInfoMapper.selectDrawUserInfoById(awarDrecordId); + } + + /** + * 查询用户信息收集页面列表 + * + * @param drawUserInfo 用户信息收集页面 + * @return 用户信息收集页面 + */ + @Override + public List selectDrawUserInfoList(DrawUserInfo drawUserInfo) + { + return drawUserInfoMapper.selectDrawUserInfoList(drawUserInfo); + } + + /** + * 新增用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + @Override + public int insertDrawUserInfo(DrawUserInfo drawUserInfo) + { + drawUserInfo.setCreateTime(DateUtils.getNowDate()); + return drawUserInfoMapper.insertDrawUserInfo(drawUserInfo); + } + + /** + * 修改用户信息收集页面 + * + * @param drawUserInfo 用户信息收集页面 + * @return 结果 + */ + @Override + public int updateDrawUserInfo(DrawUserInfo drawUserInfo) + { + drawUserInfo.setUpdateTime(DateUtils.getNowDate()); + return drawUserInfoMapper.updateDrawUserInfo(drawUserInfo); + } + + /** + * 删除用户信息收集页面对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteDrawUserInfoByIds(String ids) + { + return drawUserInfoMapper.deleteDrawUserInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除用户信息收集页面信息 + * + * @param awarDrecordId 用户信息收集页面ID + * @return 结果 + */ + @Override + public int deleteDrawUserInfoById(Long awarDrecordId) + { + return drawUserInfoMapper.deleteDrawUserInfoById(awarDrecordId); + } +} \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/activity/DrawUserInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawUserInfoMapper.xml new file mode 100644 index 000000000..b39d1aaa6 --- /dev/null +++ b/sino-activity/src/main/resources/mapper/activity/DrawUserInfoMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + select awarDrecordId, userName, mobile, gender, address, agentName, agentMobile, agentGender, agentNo, createTime, updateTime from draw_user_info + + + + + + + + insert into draw_user_info + + userName, + mobile, + gender, + address, + agentName, + agentMobile, + agentGender, + agentNo, + createTime, + updateTime, + + + #{userName}, + #{mobile}, + #{gender}, + #{address}, + #{agentName}, + #{agentMobile}, + #{agentGender}, + #{agentNo}, + #{createTime}, + #{updateTime}, + + + + + update draw_user_info + + userName = #{userName}, + mobile = #{mobile}, + gender = #{gender}, + address = #{address}, + agentName = #{agentName}, + agentMobile = #{agentMobile}, + agentGender = #{agentGender}, + agentNo = #{agentNo}, + createTime = #{createTime}, + updateTime = #{updateTime}, + + where awarDrecordId = #{awarDrecordId} + + + + delete from draw_user_info where awarDrecordId = #{awarDrecordId} + + + + delete from draw_user_info where awarDrecordId in + + #{awarDrecordId} + + + + \ No newline at end of file From e5a574db867d6f5d7a7ae45a38f4bcd774a608c3 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Wed, 21 Apr 2021 14:35:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A8=83=E5=A8=83?= =?UTF-8?q?=E6=9C=BA=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/draw/DrawController.java | 2 +- .../src/main/resources/public/doll/index.html | 87 +++++++++---------- .../src/main/resources/public/doll/js/main.js | 66 +++++++------- 3 files changed, 75 insertions(+), 80 deletions(-) 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 877806115..e203fa6c9 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 @@ -209,7 +209,7 @@ public class DrawController { result.setRecord(prizes); return result; }*/ - String userId ="1328495419744"; + String userId =""; /* if (!"1".equals(isAll)) { Long userId1 = ShiroUtils.getUserId(); userId = userInfo.getOpenid(); diff --git a/sino-act-web/src/main/resources/public/doll/index.html b/sino-act-web/src/main/resources/public/doll/index.html index 04c43b55e..16b0b489f 100644 --- a/sino-act-web/src/main/resources/public/doll/index.html +++ b/sino-act-web/src/main/resources/public/doll/index.html @@ -1,12 +1,13 @@ - - ץ + + 积分抓好运 +
    @@ -23,21 +24,21 @@

    -

    ÿ50

    +

    每次消耗50积分

    -

    ʣ0

    +

    您还剩余0积分

    - + - + - + - + - -