新增景区

src/main/java/com/izouma/jiashanxia/domain/Attractions.java

@@ -0,0 +1,37 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("景区内容管理")
+public class Attractions extends BaseEntity {
+    @ApiModelProperty(name = "名称")
+    private String name;
+
+    @ApiModelProperty(name = "介绍")
+    private String introduction;
+
+    @ApiModelProperty(name = "地址")
+    private String address;
+
+    @ApiModelProperty(name = "电话")
+    private String phone;
+
+    /*
+    景区 AA BB
+    游玩
+    餐饮
+    住宿
+
+    日期由谁决定？团建选择
+    日期区间
+     */
+}

src/main/java/com/izouma/jiashanxia/domain/AttractionsContent.java

@@ -0,0 +1,30 @@
+package com.izouma.jiashanxia.domain;
+
+import com.izouma.jiashanxia.enums.ItemType;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("景区内项目")
+public class AttractionsContent extends BaseEntity {
+    private Long attractionsId;
+
+    @Enumerated(EnumType.STRING)
+    private ItemType type;
+
+    private String name;
+
+    private BigDecimal price;
+
+    private String remark;
+}

src/main/java/com/izouma/jiashanxia/domain/BigCustom.java

@@ -0,0 +1,22 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+
+@ApiModel(value = "大团定制表单")
+public class BigCustom {
+    private String name;
+
+    private String phone;
+
+    private String email;
+
+    @ApiModelProperty(value = "人数")
+    private String numberOfPeople;
+
+    private LocalDateTime startTime;
+
+    private LocalDateTime endTime;
+}

src/main/java/com/izouma/jiashanxia/domain/Coach.java

@@ -0,0 +1,30 @@
+package com.izouma.jiashanxia.domain;
+
+import com.izouma.jiashanxia.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Convert;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "教练表")
+public class Coach extends BaseEntity {
+
+    private String name;
+
+    private String avatar;
+
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> img;
+
+    private String introduction;
+
+    private int level;
+}

src/main/java/com/izouma/jiashanxia/domain/CoachPrice.java

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("教练级别价格表")
+public class CoachPrice extends BaseEntity {
+    private int level;
+
+    private BigDecimal price;
+}

src/main/java/com/izouma/jiashanxia/domain/CompanyWithdraw.java

@@ -0,0 +1,65 @@
+package com.izouma.jiashanxia.domain;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.izouma.jiashanxia.annotations.Searchable;
+import com.izouma.jiashanxia.enums.PayMethod;
+import com.izouma.jiashanxia.enums.WithdrawStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+//@Entity
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "企业提现申请表")
+@Where(clause = "del = 0")
+public class CompanyWithdraw extends BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "企业id", name = "companyId")
+    private Long companyId;
+
+    @ApiModelProperty(value = "提现金额", name = "amount")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "剩余金额", name = "balance")
+    private BigDecimal balance;
+
+    @ApiModelProperty(value = "审核时间", name = "auditTime")
+    private LocalDateTime auditTime;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "提现方式", name = "payMethod")
+    private PayMethod payMethod;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "提现状态", name = "status")
+    private WithdrawStatus status;
+
+    @Searchable
+    @ApiModelProperty(value = "账号", name = "account")
+    private String account;
+
+    @Searchable
+    @ApiModelProperty(value = "真实姓名", name = "realName")
+    private String realName;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "companyId", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
+    @ExcelIgnore
+    private Company company;
+
+}

src/main/java/com/izouma/jiashanxia/domain/GroupCustom.java

@@ -0,0 +1,23 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "团建定制")
+public class GroupCustom {
+    @ApiModelProperty(value = "人数")
+    private String numberOfPeople;
+
+    private LocalDateTime startTime;
+
+    private LocalDateTime endTime;
+
+    private Long attractionsId;
+
+    private Long coachLevel;
+
+    private BigDecimal amount;
+}

src/main/java/com/izouma/jiashanxia/domain/GroupCustomContent.java

@@ -0,0 +1,14 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+
+import java.time.LocalDateTime;
+
+@ApiModel("项目内容")
+public class GroupCustomContent {
+    private Long attractionsContentId;
+
+    private Integer num;
+
+    private LocalDateTime date;
+}

src/main/java/com/izouma/jiashanxia/enums/ItemType.java

@@ -0,0 +1,17 @@
+package com.izouma.jiashanxia.enums;
+
+public enum ItemType {
+    PLAY("游玩"),
+    FOOD("餐饮"),
+    LODGING("住宿");
+
+    private final String description;
+
+    ItemType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/izouma/jiashanxia/service/OrderInfoService.java

@@ -191,6 +191,7 @@ public class OrderInfoService {
 
     /*
     公司分销
+    先算个人
      */
     public void companyDis(Long companyId, String transactionId, Long userId, BigDecimal amount) {
         Company company = companyRepo.findById(companyId).orElseThrow(new BusinessException("无企业"));