redis 恢复到236

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -135,11 +135,15 @@ public class UserDeliverOrderController extends BaseApiController {
       return AjaxResult.error("订单已过期，请重新下单");
     }
     String orderId = userDeliverOrderService.submitOrder(userId, orderSettleVO);
-
+    JSONObject jsonObject = new JSONObject();
+    jsonObject.put("orderId", orderId);
+    if (orderSettleVO.getPayAmt() > 0) {
+      jsonObject.put("needPay", 1);
+    }
     // 清除缓存的订单
     redisCache.deleteObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));
 
-    return AjaxResult.success(orderId);
+    return AjaxResult.success(jsonObject);
   }
 
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -113,11 +113,11 @@ public class UserTicketController extends BaseApiController {
   @ApiOperation(value = "查看盲票幸运数字" , notes = "根据盲票组ID，获取盲票幸运数字")
   public AjaxResult queryLuckyNum(@RequestBody TicketParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
-    if (StringUtils.isBlank(param.getTicketId())) {
-      return AjaxResult.error("参数异常，盲票ID缺失");
+    if (StringUtils.isBlank(param.getSerialNo())) {
+      return AjaxResult.error("参数异常，盲票序列号缺失");
     }
 
-    Ticket ticket = ticketService.getById(param.getTicketId());
+    Ticket ticket = ticketService.getOne(new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, param.getSerialNo()));
     if (null == ticket) {
       return AjaxResult.error("参数异常，盲票不存在");
     }
@@ -128,7 +128,7 @@ public class UserTicketController extends BaseApiController {
 
     // 已付款的盲票，需要校验当前用户是否有权限查看
     if (ticket.getStatus() == TicketStatusEnum.ACTIVATED) {
-      UserTicketOrderItem orderItem = userTicketOrderItemService.queryFinishedOrderItem(userId, param.getTicketId());
+      UserTicketOrderItem orderItem = userTicketOrderItemService.queryFinishedOrderItem(userId, ticket.getTicketId());
       if (null == orderItem) {
         return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1018);
       }
@@ -158,11 +158,11 @@ public class UserTicketController extends BaseApiController {
   @ApiOperation(value = "查看兑奖奖品" , notes = "根据盲票ID，查看兑奖奖品")
   public AjaxResult queryHitPrizeList(@RequestBody TicketParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
-    if (StringUtils.isBlank(param.getTicketId())) {
+    if (StringUtils.isBlank(param.getSerialNo())) {
       return AjaxResult.error("参数异常，盲票ID缺失");
     }
 
-    Ticket ticket = ticketService.getById(param.getTicketId());
+    Ticket ticket = ticketService.getOne(new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, param.getSerialNo()));
     if (null == ticket) {
       return AjaxResult.error("参数异常，盲票不存在");
     }
@@ -184,12 +184,12 @@ public class UserTicketController extends BaseApiController {
   @ApiOperation(value = "兑奖" , notes = "选择奖品兑奖")
   public AjaxResult cashPrize(@RequestBody TicketParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
-    if (StringUtils.isBlank(param.getTicketId()) || StringUtils.isBlank(param.getAwardsId())
+    if (StringUtils.isBlank(param.getSerialNo()) || StringUtils.isBlank(param.getAwardsId())
     || StringUtils.isBlank(param.getPrizeId())) {
       return AjaxResult.error("参数缺失");
     }
 
-    Ticket ticket = ticketService.getById(param.getTicketId());
+    Ticket ticket = ticketService.getOne(new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, param.getSerialNo()));
     if (null == ticket) {
       return AjaxResult.error("参数异常，盲票不存在");
     }

mp-admin/src/main/resources/application-test.yml

@@ -14,9 +14,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 113.31.162.168
+      host: 110.40.236.236
       port: 6379
-      password: CjPfyr77Bbdfg
+      password: '@9(s2sWppxkess'
       # 连接超时时间（毫秒）
       timeout: 10000
       jedis:

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketParam.java

@@ -10,8 +10,8 @@ import lombok.Data;
 @Data
 public class TicketParam {
 
-	@ApiModelProperty(value = "盲票ID",required=false)
-	private String ticketId;
+	@ApiModelProperty(value = "盲票序列号",required=false)
+	private String serialNo;
 
 	@ApiModelProperty(value = "奖项ID",required=false)
 	private String awardsId;

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -41,6 +41,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     userDeliverOrder.setArea(userAddr.getArea());
     userDeliverOrder.setAddress(userAddr.getAddr());
     userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().size());
+    userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
     userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
     userDeliverOrder.setMemo(null);
     if (orderSettleVO.getPayAmt() > 0) {
@@ -48,8 +49,10 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     } else {
       userDeliverOrder.setStatus(DeliverOrderStatusEnum.NOT_DELIVER);
     }
+    save(userDeliverOrder);
 
-    return null;
+
+    return userDeliverOrder.getOrderId();
   }
 
   @Override