up:

1.填一等奖新增收奖人
2.获取自己的获奖明细和优惠券

src/main/java/com/bsd/say/controller/AwardListController.java

@@ -84,4 +84,22 @@ public class AwardListController extends BaseController<AwardListService, AwardL
         }
         return ajaxResult;
     }
+
+    /**
+     * 获取自己的抽奖和优惠券
+     */
+    @RequestMapping(value = "/get-award-list")
+    @ResponseBody
+    public AjaxResult getAwardList(@RequestBody AjaxRequest ajaxRequest){
+        AjaxResult ajaxResult = new AjaxResult();
+        try {
+            ajaxResult = awardListService.getAwardList(ajaxRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+            String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败";
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg(errMsg);
+        }
+        return ajaxResult;
+    }
 }

src/main/java/com/bsd/say/controller/WechatController.java

@@ -1,6 +1,6 @@
 package com.bsd.say.controller;
 
-import org.apache.tomcat.util.http.ResponseUtil;
+import com.bsd.say.util.ResponseUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -34,7 +34,8 @@ public class WechatController {
 //        logger.info("msgSignature: " + msgSignature);
 //        logger.info("postData: " + postData);
 //        thirdPartyService.getComponentVerifyTicket(timestamp, nonce, msgSignature, postData);
-//        responseUtil(response, "success");
+        ResponseUtil.doResponse(response, "success");
 //    return "success";
     }
+
 }

src/main/java/com/bsd/say/entities/AwardList.java

@@ -40,4 +40,9 @@ public class AwardList extends BaseEntity{
      * 手机号
      */
     private String phone;
+
+    /**
+     * 收奖人
+     */
+    private String receiverName;
 }

src/main/java/com/bsd/say/service/AwardListService.java

@@ -10,4 +10,6 @@ public interface AwardListService extends BaseService<AwardList>{
     AjaxResult isValidLottery(AjaxRequest ajaxRequest);
 
     AjaxResult saveAward(AjaxRequest ajaxRequest);
+
+    AjaxResult getAwardList(AjaxRequest ajaxRequest);
 }

src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bsd.say.beans.AjaxRequest;
 import com.bsd.say.beans.AjaxResult;
 import com.bsd.say.entities.AwardList;
+import com.bsd.say.entities.Coupon;
 import com.bsd.say.entities.Users;
 import com.bsd.say.mapper.AwardListMapper;
+import com.bsd.say.mapper.CouponMapper;
 import com.bsd.say.mapper.UsersMapper;
 import com.bsd.say.service.AwardListService;
+import com.bsd.say.service.CouponService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +34,8 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
     protected AwardListMapper awardListMapper;
     @Resource
     private RedisTemplate redisTemplate;
+    @Resource
+    private CouponMapper couponMapper;
 
     @Override
     public AwardListMapper getBaseMapper() {
@@ -165,9 +170,10 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
             String code = data.getString("code");
             String phone = data.getString("phone");
             String noteCode = data.getString("noteCode");
-            String address = data.getString("adress");
+            String address = data.getString("address");
+            String receiverName = data.getString("receiverName");
             if (StringUtils.isBlank(code)||StringUtils.isBlank(phone)
-                    ||StringUtils.isBlank(noteCode)){
+                    ||StringUtils.isBlank(noteCode)||StringUtils.isBlank(receiverName)){
                 ajaxResult.setRetcode(AjaxResult.FAILED);
                 ajaxResult.setRetmsg("PARAM MISSING");
                 return ajaxResult;
@@ -196,6 +202,7 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
                     }
                     awardList.setAddress(address);
                     awardList.setPhone(phone);
+                    awardList.setReceiverName(receiverName);
                     awardListMapper.updateById(awardList);
                     ajaxResult.setRetmsg("SUCCESS");
                     ajaxResult.setRetcode(AjaxResult.SUCCESS);
@@ -210,4 +217,60 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
         return ajaxResult;
     }
 
+    /**
+     * 通过code获取优惠券和抽奖
+     * @param ajaxRequest
+     * @return
+     */
+    @Override
+    public AjaxResult getAwardList(AjaxRequest ajaxRequest) {
+        AjaxResult ajaxResult = new AjaxResult();
+        JSONObject data = ajaxRequest.getData();
+        if (data == null){
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg("DATA MISSING");
+            return ajaxResult;
+        }else{
+            String code = data.getString("code");
+            if (StringUtils.isBlank(code)){
+                ajaxResult.setRetcode(AjaxResult.FAILED);
+                ajaxResult.setRetmsg("CODE MISSING");
+                return ajaxResult;
+            }else {
+                String unionId = "123";
+                Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
+                        .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+                if (users == null){
+                    ajaxResult.setRetcode(AjaxResult.FAILED);
+                    ajaxResult.setRetmsg("NOT FOUND USERS");
+                    return ajaxResult;
+                }else {
+                    Coupon coupon = couponMapper.selectOne(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getUserId,users.getId())
+                            .and(queryWrapper1 -> queryWrapper1.eq(Coupon::getState,1)));
+                    AwardList awardList = awardListMapper.selectOne(Wrappers.<AwardList>lambdaQuery().eq(AwardList::getUserId,users.getId())
+                            .and(queryWrapper1 -> queryWrapper1.eq(AwardList::getState,1)));
+                    JSONObject result = new JSONObject();
+                    if (coupon != null){
+                        String jsonString = JSONObject.toJSONString(coupon);
+                        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+                        result.put("coupon",jsonObject);
+                    }else {
+                        result.put("coupon",new JSONObject());
+                    }
+                    if (awardList != null){
+                        String jsonString = JSONObject.toJSONString(awardList);
+                        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+                        result.put("awardList",jsonObject);
+                    }else {
+                        result.put("awardList",new JSONObject());
+                    }
+                    ajaxResult.setRetmsg("SUCCESS");
+                    ajaxResult.setData(result);
+                    ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                }
+            }
+        }
+        return ajaxResult;
+    }
+
 }

src/main/java/com/bsd/say/util/ResponseUtil.java

@@ -0,0 +1,28 @@
+package com.bsd.say.util;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ResponseUtil {
+
+//    public static final Logger logger = Logger.getLogger(ResponseUtil.class);
+
+//    private static ObjectMapper objectMapper = JsonUtil.getObjectMapper();
+
+    public static void doResponse(HttpServletResponse response, Object obj) {
+
+//        String jsonStr = null;
+        String result = obj.toString();
+        try {
+            response.getWriter().print(result);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+}