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

Dev

See merge request quanshu/mp-server!464

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

@@ -1,10 +1,15 @@
 package com.qs.mp.web.controller.api.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.domain.Area;
+import com.qs.mp.common.domain.vo.CityVO;
+import com.qs.mp.common.domain.vo.ProvinceVO;
 import com.qs.mp.common.service.IAreaService;
 import com.qs.mp.web.controller.common.BaseApiController;
+
+import java.util.ArrayList;
 import java.util.List;
 import javax.validation.Valid;
 
@@ -12,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -35,6 +41,34 @@ public class AreaMgrController extends BaseApiController {
     @Autowired
     private IAreaService areaService;
 
+    @PostMapping("/admin/area/tree/list")
+    @ApiOperation("省市树状列表")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = Area.class)
+    )
+    public AjaxResult treeList() {
+        // 获取省
+        List<Area> provinceList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getParentId, 0));
+        List<ProvinceVO> provinceVOList = new ArrayList<>();
+        for (Area province : provinceList) {
+            ProvinceVO provinceVO = new ProvinceVO();
+            BeanUtils.copyProperties(province, provinceVO);
+            // 获取市
+            List<Area> cityList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getParentId, province.getAreaId()));
+
+            List<CityVO> cityVOList = new ArrayList<>();
+            for (Area city : cityList) {
+                CityVO cityVO = new CityVO();
+                BeanUtils.copyProperties(city, cityVO);
+                cityVOList.add(cityVO);
+            }
+            provinceVO.setCityList(cityVOList);
+            provinceVOList.add(provinceVO);
+        }
+        return AjaxResult.success(provinceVOList);
+    }
+
+
     /**
      * 分页获取
      */

mp-service/src/main/java/com/qs/mp/common/domain/vo/CityVO.java

@@ -0,0 +1,23 @@
+package com.qs.mp.common.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Cup
+ * @date 2022/5/6
+ */
+@ApiModel("市信息")
+@Data
+public class CityVO {
+
+    @ApiModelProperty("区域id")
+    private Long areaId;
+
+    @ApiModelProperty("区域名称")
+    private String areaName;
+}

mp-service/src/main/java/com/qs/mp/common/domain/vo/ProvinceVO.java

@@ -0,0 +1,29 @@
+package com.qs.mp.common.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Cup
+ * @date 2022/5/6
+ */
+@ApiModel("省份信息")
+@Data
+public class ProvinceVO {
+
+    @ApiModelProperty("区域id")
+    private Long areaId;
+
+    @ApiModelProperty("区域名称")
+    private String areaName;
+
+    @ApiModelProperty("市信息")
+    private List<CityVO> cityList;
+
+}

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

@@ -13,6 +13,9 @@ import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -22,6 +25,7 @@ import lombok.Data;
  */
 @TableName("mp_user_ticket_order")
 @Data
+@ApiModel("用户盲票订单实体类")
 public class UserTicketOrder implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -29,78 +33,96 @@ public class UserTicketOrder implements Serializable {
   /**
    * 主键
    */
+  @ApiModelProperty("订单id")
   @TableId(value = "order_id", type = IdType.INPUT)
   private String orderId;
 
   /**
    * 用户ID
    */
+  @ApiModelProperty("用户id")
   @TableField("user_id")
   private Long userId;
 
   /**
    * 标题
    */
+  @ApiModelProperty("标题")
   @TableField("title")
   private String title;
 
   /**
    * 票组ID
    */
+  @ApiModelProperty("票组id")
   @TableField("box_id")
   private String boxId;
 
+
+  @ApiModelProperty("盲票销售价格")
+  @TableField("sale_price")
+  private Integer salePrice;
+
   /**
    * 订单金额
    */
+  @ApiModelProperty("订单金额")
   @TableField("order_amt")
   private Integer orderAmt;
 
   /**
    * 优惠金额
    */
+  @ApiModelProperty("优惠金额")
   @TableField("discount_amt")
   private Integer discountAmt;
 
   /**
    * 实付金额
    */
+  @ApiModelProperty("实付金额")
   @TableField("pay_amt")
   private Integer payAmt;
 
   /**
    * 盲票数量
    */
+  @ApiModelProperty("盲票数量")
   @TableField("ticket_num")
   private Integer ticketNum;
 
   /**
    * 订单备注
    */
+  @ApiModelProperty("订单备注")
   @TableField("memo")
   private String memo;
 
   /**
    * 订单来源
    */
+  @ApiModelProperty("订单来源")
   @TableField("resource")
   private TicketTypeEnum resource;
 
   /**
    * 使用优惠信息
    */
+  @ApiModelProperty("使用优惠信息")
   @TableField("coupon_info")
   private String couponInfo;
 
   /**
    * 分享信息
    */
+  @ApiModelProperty("分享信息")
   @TableField("share_info")
   private String shareInfo;
 
   /**
    * 订单状态;-1 已取消 0:待付款 1:已完成
    */
+  @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
   @TableField("status")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private UserTicketOrderStatusEnum status;
@@ -108,6 +130,7 @@ public class UserTicketOrder implements Serializable {
   /**
    * 结佣标识，1代表已结佣 0代表未结佣
    */
+  @ApiModelProperty("结佣标识，1代表已结佣 0代表未结佣")
   @TableField("comm_status")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private CommStatusEnum commStatus;
@@ -115,18 +138,21 @@ public class UserTicketOrder implements Serializable {
   /**
    * 结佣渠道ID
    */
+  @ApiModelProperty("结佣渠道ID")
   @TableField("channel_id")
   private Long channelId;
 
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   @Version
   private Date updatedTime;

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

@@ -155,6 +155,7 @@ public class UserTicketOrderServiceImpl extends
     userTicketOrder.setUserId(userId);
     userTicketOrder.setTitle(ticketBox.getTitle());
     userTicketOrder.setBoxId(orderSettleVO.getBoxId());
+    userTicketOrder.setSalePrice(ticketBox.getSalePrice());
     userTicketOrder.setOrderAmt(orderSettleVO.getOrderAmt());
     userTicketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     userTicketOrder.setPayAmt(orderSettleVO.getPayAmt());