Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!880

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

@@ -2,9 +2,13 @@ package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.Ticket;
 import com.qs.mp.admin.domain.TicketBox;
+import com.qs.mp.admin.domain.TicketBoxGoods;
 import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.vo.TicketBoxGoodsListVO;
+import com.qs.mp.admin.service.ITicketBoxGoodsService;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.admin.service.ITicketPackageService;
 import com.qs.mp.admin.service.ITicketService;
@@ -93,12 +97,18 @@ public class UserTicketOrderController extends BaseApiController {
     @Autowired
     private ITicketPackageService ticketPackageService;
 
+    @Autowired
+    private ITicketBoxGoodsService ticketBoxGoodsService;
+
 
     /**
      * 订单结算，每次更换优惠券时需重新请求此接口
      */
     @PostMapping("/order/settle")
     @ApiOperation(value = "订单结算", notes = "单个盲票商品上点立即购买")
+    @ApiResponses(
+        @ApiResponse(code = 200, message = "OK", response = TicketOrderSettleVO.class)
+    )
     public AjaxResult settle(@Valid @RequestBody TicketOrderParam param) {
         if (StringUtils.isBlank(param.getTicketId()) && StringUtils.isBlank(param.getBoxId())) {
             return AjaxResult.error("参数缺失");
@@ -159,6 +169,14 @@ public class UserTicketOrderController extends BaseApiController {
         AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
         orderSettleVO.setAppId(appSourceEnum.getAppId());
 
+        QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
+        List<TicketBoxGoodsListVO> ticketBoxGoodsListVOS = ticketBoxService.listTicketGoodsByQueryWrapper(queryWrapper);
+        if (!CollectionUtils.isEmpty(ticketBoxGoodsListVOS)) {
+            TicketBoxGoodsListVO ticketBoxGoodsListVO = ticketBoxGoodsListVOS.get(0);
+            orderSettleVO.setGoodsPicUrl(ticketBoxGoodsListVO.getPicUrl());
+            orderSettleVO.setGoodsTitle(ticketBoxGoodsListVO.getTitle());
+        }
+
         // 缓存订单结算对象
         redisCache.setCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId), orderSettleVO, 10,
             TimeUnit.MINUTES);

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderDetailVO.java

@@ -35,6 +35,9 @@ public class UserTicketOrderDetailVO {
     @ApiModelProperty("实付金额")
     private Integer payAmt;
 
+    @ApiModelProperty("支付类型1支付宝,2微信,10支付宝直连")
+    private String payType;
+
     @ApiModelProperty("用户昵称")
     private String nickName;
 

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderListVO.java

@@ -41,6 +41,9 @@ public class UserTicketOrderListVO {
     @ApiModelProperty("盲票数量")
     private Integer ticketNum;
 
+    @ApiModelProperty("支付类型:1支付宝,2微信,10支付宝直连")
+    private String payType;
+
     @ApiModelProperty("实付金额")
     private Integer payAmt;
 

mp-service/src/main/java/com/qs/mp/user/domain/vo/TicketOrderSettleVO.java

@@ -59,9 +59,15 @@ public class TicketOrderSettleVO {
     /**
      * 盲票标题
      */
-    @ApiModelProperty("盲票图片")
+    @ApiModelProperty("盲票标题")
     private String title;
 
+    @ApiModelProperty("盲票关联商品图片")
+    private String goodsPicUrl;
+
+    @ApiModelProperty("盲票关联商品标题")
+    private String goodsTitle;
+
 
     @ApiModelProperty("小程序appId")
     private String appId;

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -138,6 +138,7 @@
 				t1.status,
 				t1.title,
 				t1.sale_price,
+				t1.pay_type,
 				t1.pay_amt,
 				t1.discount_amt,
 				t1.ticket_num,
@@ -160,6 +161,7 @@
 				t1.sale_comm_rate,
 				t1.sale_price,
 				t1.pay_amt,
+				t1.pay_type,
 				t1.created_time,
 				t1.ticket_num,
 				t2.nick_name,