新建数据库

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

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
 
 @AllArgsConstructor
 @NoArgsConstructor
-//@Entity
+@Entity
 @Builder
 @Data
 @ApiModel(value = "佣金记录", description = "CommissionRecord")

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

@@ -7,7 +7,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import java.util.List;
 
@@ -19,11 +21,14 @@ import java.util.List;
 @ApiModel(value = "企业表")
 public class Company extends BaseEntity {
 
+    private Long userId;
+
     @ApiModelProperty(value = "企业名称")
     private String name;
 
     @ApiModelProperty(value = "员工")
-    @OneToMany
+    @OneToMany(cascade = CascadeType.DETACH)
+    @JoinColumn(name = "user_id")
     private List<User> users;
 
 

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

@@ -0,0 +1,33 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+public class GoodsInfo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String name;
+
+
+    @ApiModelProperty(value = "价格", name = "price")
+    private BigDecimal price;
+
+    @Builder.Default
+    @Column(nullable = false)
+    private Boolean del = false;
+}

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

@@ -7,10 +7,14 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+import java.math.BigDecimal;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Entity
 @ApiModel(value = "套餐商品")
 public class SetGoods extends BaseEntity {
     private Long setId;
@@ -18,9 +22,16 @@ public class SetGoods extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private String name;
 
+    private String enName;
+
     @ApiModelProperty(value = "数量")
     private Integer num;
 
     @ApiModelProperty(value = "单位")
     private String unit;
+
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
+
+    private String remark;
 }

src/main/java/com/izouma/jiashanxia/domain/Set.java → src/main/java/com/izouma/jiashanxia/domain/SetInfo.java

@@ -8,23 +8,27 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 @Builder
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "套餐")
-public class Set extends BaseEntity {
+@ApiModel(value = "套餐信息")
+public class SetInfo extends BaseEntity {
 
     @ApiModelProperty(value = "套餐名称")
     private String name;
 
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "套餐标签")
+    private String tag;
+
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
@@ -38,7 +42,7 @@ public class Set extends BaseEntity {
     @ApiModelProperty(value = "图")
     private String img;
 
-    @OneToMany(cascade = CascadeType.DETACH)
-    @JoinColumn(name = "set_goods_id")
-    private List<SetGoods> setGoods;
+//    @OneToMany(cascade = CascadeType.DETACH)
+//    @JoinColumn(name = "set_goods_id")
+//    private List<SetGoods> setGoods;
 }

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

@@ -1,20 +1,35 @@
 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;
 
+import javax.persistence.Entity;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Entity
 @ApiModel(value = "用户套餐")
 public class UserSet extends BaseEntity {
+
     private Long userId;
 
-    private Long setId;
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    private String enName;
+
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
 
+    private String remark;
 
 }

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

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-//@Entity
+@Entity
 @Data
 @Builder
 @NoArgsConstructor
@@ -32,8 +32,8 @@ public class Withdraw extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "剩余金额", name = "balance")
     private BigDecimal balance;
 
-    @ApiModelProperty(value = "提现时间", name = "settleTime")
-    private LocalDateTime withdrawTime;
+    @ApiModelProperty(value = "审核时间", name = "auditTime")
+    private LocalDateTime auditTime;
 
     @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "提现方式", name = "payMethod")
@@ -51,9 +51,9 @@ public class Withdraw extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "真实姓名", name = "realName")
     private String realName;
 
-    @ApiModelProperty(value = "是否成功", name = "consent")
-    @Column(nullable = false)
-    private Boolean consent;
+//    @ApiModelProperty(value = "是否成功", name = "consent")
+//    @Column(nullable = false)
+//    private Boolean consent;
 
 //    @ManyToOne(fetch = FetchType.LAZY)
 //    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))

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

@@ -0,0 +1,68 @@
+package com.izouma.jiashanxia.enums;
+
+public enum GoodName {
+    /*
+    大锅灶/烧烤
+     */
+    LARGE_POT_STOVE_OR_BBQ,
+    /*
+    野外露营
+     */
+    CAMPING,
+    /*
+    小公鸡
+     */
+    COCK,
+    /*
+    蔬菜
+     */
+    VEGETABLES,
+    /*
+    真人CS
+     */
+    REAL_CS,
+    /*
+    冒险森林
+     */
+    ADVENTURE_FOREST,
+    /*
+    射箭
+     */
+    ARCHERY,
+    /*
+    波波球
+     */
+    BOBO_BALL,
+    /*
+    无动力乐园
+     */
+    UNPOWERED_PARADISE,
+    /*
+    大锅灶
+     */
+    LARGE_POT_STOVE,
+    /*
+    烧烤套餐
+     */
+    BBQ,
+    /*
+    民宿
+     */
+    HOMESTAY,
+    /*
+    草鸡蛋
+     */
+    GRASS_EGG,
+    /*
+    生态火锅
+     */
+    ECO_HOT_POT,
+    /*
+    冰壶
+     */
+    CURLING,
+    /*
+    篝火晚会
+     */
+    CAMPFIRE
+}

src/main/java/com/izouma/jiashanxia/repo/CommissionRecordRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.CommissionRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface CommissionRecordRepo extends JpaRepository<CommissionRecord, Long>, JpaSpecificationExecutor<CommissionRecord> {
+    @Query("update CommissionRecord t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/jiashanxia/repo/GoodsInfoRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.GoodsInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface GoodsInfoRepo extends JpaRepository<GoodsInfo, Long>, JpaSpecificationExecutor<GoodsInfo> {
+    @Query("update GoodsInfo t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/jiashanxia/repo/SetGoodsRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.SetGoods;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface SetGoodsRepo extends JpaRepository<SetGoods, Long>, JpaSpecificationExecutor<SetGoods> {
+    @Query("update SetGoods t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/jiashanxia/repo/SetInfoRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.SetInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface SetInfoRepo extends JpaRepository<SetInfo, Long>, JpaSpecificationExecutor<SetInfo> {
+    @Query("update SetInfo t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/jiashanxia/repo/WithdrawRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.Withdraw;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface WithdrawRepo extends JpaRepository<Withdraw, Long>, JpaSpecificationExecutor<Withdraw> {
+    @Query("update Withdraw t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.CommissionRecord;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.CommissionRecordRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class CommissionRecordService {
+
+    private CommissionRecordRepo commissionRecordRepo;
+
+    public Page<CommissionRecord> all(PageQuery pageQuery) {
+        return commissionRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, CommissionRecord.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.GoodsInfo;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.GoodsInfoRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class GoodsInfoService {
+
+    private GoodsInfoRepo goodsInfoRepo;
+
+    public Page<GoodsInfo> all(PageQuery pageQuery) {
+        return goodsInfoRepo.findAll(JpaUtils.toSpecification(pageQuery, GoodsInfo.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.SetGoodsRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class SetGoodsService {
+
+    private SetGoodsRepo setGoodsRepo;
+
+    public Page<SetGoods> all(PageQuery pageQuery) {
+        return setGoodsRepo.findAll(JpaUtils.toSpecification(pageQuery, SetGoods.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.SetInfo;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.SetInfoRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class SetInfoService {
+
+    private SetInfoRepo setInfoRepo;
+
+    public Page<SetInfo> all(PageQuery pageQuery) {
+        return setInfoRepo.findAll(JpaUtils.toSpecification(pageQuery, SetInfo.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.Withdraw;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.WithdrawRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class WithdrawService {
+
+    private WithdrawRepo withdrawRepo;
+
+    public Page<Withdraw> all(PageQuery pageQuery) {
+        return withdrawRepo.findAll(JpaUtils.toSpecification(pageQuery, Withdraw.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/jiashanxia/web/CommissionRecordController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.CommissionRecord;
+import com.izouma.jiashanxia.service.CommissionRecordService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.CommissionRecordRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/commissionRecord")
+@AllArgsConstructor
+public class CommissionRecordController extends BaseController {
+    private CommissionRecordService commissionRecordService;
+    private CommissionRecordRepo commissionRecordRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public CommissionRecord save(@RequestBody CommissionRecord record) {
+        if (record.getId() != null) {
+            CommissionRecord orig = commissionRecordRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return commissionRecordRepo.save(orig);
+        }
+        return commissionRecordRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<CommissionRecord> all(@RequestBody PageQuery pageQuery) {
+        return commissionRecordService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public CommissionRecord get(@PathVariable Long id) {
+        return commissionRecordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        commissionRecordRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<CommissionRecord> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/jiashanxia/web/GoodsInfoController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.GoodsInfo;
+import com.izouma.jiashanxia.service.GoodsInfoService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.GoodsInfoRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/goodsInfo")
+@AllArgsConstructor
+public class GoodsInfoController extends BaseController {
+    private GoodsInfoService goodsInfoService;
+    private GoodsInfoRepo goodsInfoRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public GoodsInfo save(@RequestBody GoodsInfo record) {
+        if (record.getId() != null) {
+            GoodsInfo orig = goodsInfoRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return goodsInfoRepo.save(orig);
+        }
+        return goodsInfoRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<GoodsInfo> all(@RequestBody PageQuery pageQuery) {
+        return goodsInfoService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public GoodsInfo get(@PathVariable Long id) {
+        return goodsInfoRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        goodsInfoRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<GoodsInfo> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/jiashanxia/web/SetGoodsController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.service.SetGoodsService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.SetGoodsRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/setGoods")
+@AllArgsConstructor
+public class SetGoodsController extends BaseController {
+    private SetGoodsService setGoodsService;
+    private SetGoodsRepo setGoodsRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public SetGoods save(@RequestBody SetGoods record) {
+        if (record.getId() != null) {
+            SetGoods orig = setGoodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return setGoodsRepo.save(orig);
+        }
+        return setGoodsRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<SetGoods> all(@RequestBody PageQuery pageQuery) {
+        return setGoodsService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public SetGoods get(@PathVariable Long id) {
+        return setGoodsRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        setGoodsRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<SetGoods> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/jiashanxia/web/SetInfoController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.SetInfo;
+import com.izouma.jiashanxia.service.SetInfoService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.SetInfoRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/setInfo")
+@AllArgsConstructor
+public class SetInfoController extends BaseController {
+    private SetInfoService setInfoService;
+    private SetInfoRepo setInfoRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public SetInfo save(@RequestBody SetInfo record) {
+        if (record.getId() != null) {
+            SetInfo orig = setInfoRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return setInfoRepo.save(orig);
+        }
+        return setInfoRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<SetInfo> all(@RequestBody PageQuery pageQuery) {
+        return setInfoService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public SetInfo get(@PathVariable Long id) {
+        return setInfoRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        setInfoRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<SetInfo> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/jiashanxia/web/WithdrawController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.Withdraw;
+import com.izouma.jiashanxia.service.WithdrawService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.WithdrawRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/withdraw")
+@AllArgsConstructor
+public class WithdrawController extends BaseController {
+    private WithdrawService withdrawService;
+    private WithdrawRepo withdrawRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Withdraw save(@RequestBody Withdraw record) {
+        if (record.getId() != null) {
+            Withdraw orig = withdrawRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return withdrawRepo.save(orig);
+        }
+        return withdrawRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Withdraw> all(@RequestBody PageQuery pageQuery) {
+        return withdrawService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Withdraw get(@PathVariable Long id) {
+        return withdrawRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        withdrawRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Withdraw> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/CommissionRecord.json

@@ -0,0 +1 @@
+{"tableName":"CommissionRecord","className":"CommissionRecord","remark":"佣金记录","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"transactionType","modelName":"transactionType","remark":"交易类型","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"提现\",\"value\":\"TIXIAN\"},{\"label\":\"收入\",\"value\":\"INCOME\"},{\"label\":\"退款\",\"value\":\"REFUND\"}]"},{"name":"amount","modelName":"amount","remark":"交易金额","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"payMethod","modelName":"payMethod","remark":"支付方式","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"微信\",\"value\":\"WEIXIN\"},{\"label\":\"余额\",\"value\":\"YUE\"}]"},{"name":"transactionId","modelName":"transactionId","remark":"交易单号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.CommissionRecord"}

src/main/resources/genjson/GoodsInfo.json

@@ -0,0 +1 @@
+{"tableName":"GoodsInfo","className":"GoodsInfo","remark":"商品信息","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"id","modelName":"id","remark":"id","showInList":true,"showInForm":true,"formType":"number"},{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"price","modelName":"price","remark":"价格","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.GoodsInfo"}

src/main/resources/genjson/SetGoods.json

@@ -0,0 +1 @@
+{"tableName":"SetGoods","className":"SetGoods","remark":"套餐内商品","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"setId","modelName":"setId","remark":"setId","showInList":true,"showInForm":true,"formType":"number"},{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"enName","modelName":"enName","remark":"英文名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"num","modelName":"num","remark":"数量","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"unit","modelName":"unit","remark":"单位","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"price","modelName":"price","remark":"价格","showInList":true,"showInForm":true,"formType":"number"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[{"name":"select","column":"name","subColumn":"name","subCode":"GoodsInfo"}],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.SetGoods"}

src/main/resources/genjson/SetInfo.json

@@ -0,0 +1 @@
+{"tableName":"SetInfo","className":"SetInfo","remark":"套餐信息","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"套餐名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"title","modelName":"title","remark":"标题","showInList":true,"showInForm":true,"formType":"singleLineText","required":false},{"name":"img","modelName":"img","remark":"图","showInList":true,"showInForm":true,"formType":"multiImage"},{"name":"tag","modelName":"tag","remark":"套餐标签","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"amount","modelName":"amount","remark":"金额","showInList":true,"showInForm":true,"formType":"number","required":true},{"name":"detail","modelName":"detail","remark":"详情","showInList":true,"showInForm":true,"formType":"richText","required":false},{"name":"type","modelName":"type","remark":"套餐类型","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"团队\",\"value\":\"TEAM\"},{\"label\":\"个人\",\"value\":\"PERSONAL\"}]"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.SetInfo"}

src/main/resources/genjson/Withdraw.json

@@ -0,0 +1 @@
+{"tableName":"Withdraw","className":"Withdraw","remark":"提现申请","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"amount","modelName":"amount","remark":"提现金额","showInList":true,"showInForm":true,"formType":"number"},{"name":"auditTime","modelName":"auditTime","remark":"审核时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"payMethod","modelName":"payMethod","remark":"提现方式","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"微信\",\"value\":\"WEIXIN\"},{\"label\":\"余额\",\"value\":\"YUE\"}]"},{"name":"status","modelName":"status","remark":"提现状态","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"提现成功\",\"value\":\"SUCCESS\"},{\"label\":\"提现失败\",\"value\":\"FAIL\"},{\"label\":\"待处理\",\"value\":\"PENDING\"}]"},{"name":"account","modelName":"account","remark":"账号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"realName","modelName":"realName","remark":"真实姓名","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.Withdraw"}

src/main/vue/src/components/SetInfoEdit.vue

@@ -0,0 +1,198 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="套餐名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="title" label="标题">
+                <el-input v-model="formData.title"></el-input>
+            </el-form-item>
+            <el-form-item prop="img" label="图">
+                <multi-upload v-model="formData.img"></multi-upload>
+            </el-form-item>
+            <el-form-item prop="tag" label="套餐标签">
+                <el-tag
+                    :key="tag"
+                    v-for="tag in dynamicTags"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose(tag)"
+                    size="medium"
+                >
+                    {{ tag }}
+                </el-tag>
+                <el-input
+                    class="input-new-tag"
+                    v-if="inputVisible"
+                    v-model="inputValue"
+                    ref="saveTagInput"
+                    size="small"
+                    @keyup.enter.native="handleInputConfirm"
+                    @blur="handleInputConfirm"
+                >
+                </el-input>
+                <el-button v-else class="button-new-tag" size="small" @click="showInput">新建标签</el-button>
+            </el-form-item>
+            <el-form-item prop="amount" label="金额">
+                <el-input-number type="number" v-model="formData.amount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="detail" label="详情">
+                <rich-text v-model="formData.detail"></rich-text>
+            </el-form-item>
+            <el-form-item prop="type" label="套餐类型">
+                <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'SetInfoEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('setInfo/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                    dynamicTags = res.tag.split(',');
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入套餐名称',
+                        trigger: 'blur'
+                    }
+                ],
+                amount: [
+                    {
+                        required: true,
+                        message: '请输入金额',
+                        trigger: 'blur'
+                    }
+                ],
+                type: [
+                    {
+                        required: true,
+                        message: '请输入套餐类型',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            typeOptions: [
+                { label: '团队', value: 'TEAM' },
+                { label: '个人', value: 'PERSONAL' }
+            ],
+            dynamicTags: [],
+            inputVisible: false,
+            inputValue: ''
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            data.tag = this.dynamicTags.join(',');
+            this.saving = true;
+            this.$http
+                .post('/setInfo/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setInfo/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        handleClose(tag) {
+            this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+        },
+
+        showInput() {
+            this.inputVisible = true;
+            this.$nextTick(_ => {
+                this.$refs.saveTagInput.$refs.input.focus();
+            });
+        },
+
+        handleInputConfirm() {
+            let inputValue = this.inputValue;
+            if (inputValue) {
+                this.dynamicTags.push(inputValue);
+            }
+            this.inputVisible = false;
+            this.inputValue = '';
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.el-tag + .el-tag {
+    margin-left: 10px;
+}
+.button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+}
+.input-new-tag {
+    width: 100px;
+    margin-left: 10px;
+    vertical-align: bottom;
+}
+</style>

src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://localhost:8080';
-        baseUrl = 'http://192.168.50.127:8080';
+        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/router.js

@@ -102,6 +102,80 @@ const router = new Router({
                     meta: {
                         title: '上传'
                     }
+                },
+                {
+                    path: '/withdrawEdit',
+                    name: 'WithdrawEdit',
+                    component: () => import(/* webpackChunkName: "withdrawEdit" */ '@/views/WithdrawEdit.vue'),
+                    meta: {
+                        title: '提现申请编辑'
+                    }
+                },
+                {
+                    path: '/withdrawList',
+                    name: 'WithdrawList',
+                    component: () => import(/* webpackChunkName: "withdrawList" */ '@/views/WithdrawList.vue'),
+                    meta: {
+                        title: '提现申请'
+                    }
+                },
+                {
+                    path: '/commissionRecordEdit',
+                    name: 'CommissionRecordEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "commissionRecordEdit" */ '@/views/CommissionRecordEdit.vue'),
+                    meta: {
+                        title: '佣金记录编辑'
+                    }
+                },
+                {
+                    path: '/commissionRecordList',
+                    name: 'CommissionRecordList',
+                    component: () =>
+                        import(/* webpackChunkName: "commissionRecordList" */ '@/views/CommissionRecordList.vue'),
+                    meta: {
+                        title: '佣金记录'
+                    }
+                },
+                {
+                    path: '/setInfoEdit',
+                    name: 'SetInfoEdit',
+                    component: () => import(/* webpackChunkName: "setInfoEdit" */ '@/views/SetInfoEdit.vue'),
+                    meta: {
+                        title: '套餐信息编辑'
+                    }
+                },
+                {
+                    path: '/setInfoList',
+                    name: 'SetInfoList',
+                    component: () => import(/* webpackChunkName: "setInfoList" */ '@/views/SetInfoList.vue'),
+                    meta: {
+                        title: '套餐信息'
+                    }
+                },
+                {
+                    path: '/goodsInfoList',
+                    name: 'GoodsInfoList',
+                    component: () => import(/* webpackChunkName: "goodsInfoList" */ '@/views/GoodsInfoList.vue'),
+                    meta: {
+                        title: '商品信息'
+                    }
+                },
+                {
+                    path: '/setGoodsEdit',
+                    name: 'SetGoodsEdit',
+                    component: () => import(/* webpackChunkName: "setGoodsEdit" */ '@/views/SetGoodsEdit.vue'),
+                    meta: {
+                        title: '套餐内商品编辑'
+                    }
+                },
+                {
+                    path: '/setGoodsList',
+                    name: 'SetGoodsList',
+                    component: () => import(/* webpackChunkName: "setGoodsList" */ '@/views/SetGoodsList.vue'),
+                    meta: {
+                        title: '套餐内商品'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/CommissionRecordEdit.vue

@@ -0,0 +1,147 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="userId" label="用户ID">
+                <el-input v-model="formData.userId"></el-input>
+            </el-form-item>
+            <el-form-item prop="transactionType" label="交易类型">
+                <el-select v-model="formData.transactionType" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in transactionTypeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="amount" label="交易金额">
+                <el-input-number type="number" v-model="formData.amount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="payMethod" label="支付方式">
+                <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in payMethodOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="transactionId" label="交易单号">
+                <el-input v-model="formData.transactionId"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'CommissionRecordEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('commissionRecord/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                transactionType: [
+                    {
+                        required: true,
+                        message: '请输入交易类型',
+                        trigger: 'blur'
+                    }
+                ],
+                amount: [
+                    {
+                        required: true,
+                        message: '请输入交易金额',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            transactionTypeOptions: [
+                { label: '提现', value: 'TIXIAN' },
+                { label: '收入', value: 'INCOME' },
+                { label: '退款', value: 'REFUND' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/commissionRecord/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/commissionRecord/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/CommissionRecordList.vue

@@ -0,0 +1,185 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="transactionType" label="交易类型" :formatter="transactionTypeFormatter">
+            </el-table-column>
+            <el-table-column prop="amount" label="交易金额"> </el-table-column>
+            <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="transactionId" label="交易单号"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'CommissionRecordList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/commissionRecord/all',
+            downloading: false,
+            transactionTypeOptions: [
+                { label: '提现', value: 'TIXIAN' },
+                { label: '收入', value: 'INCOME' },
+                { label: '退款', value: 'REFUND' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        transactionTypeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.transactionTypeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        payMethodFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payMethodOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/commissionRecordEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/commissionRecordEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/commissionRecord/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/commissionRecord/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/GoodsInfoList.vue

@@ -0,0 +1,219 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="editRow()" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="price" label="价格(元)"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row, true)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+
+        <el-dialog :visible.sync="showDialog" width="500px" title="编辑商品" :close-on-click-modal="false">
+            <el-form :model="formData" :rules="rules" ref="form" label-width="52px" label-position="right" size="small">
+                <el-form-item prop="name" label="名称">
+                    <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+                <el-form-item prop="price" label="价格">
+                    <el-input v-model="formData.price"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer">
+                <el-button type="primary" size="mini" @click="save" :loading="saving">保存</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'GoodsInfoList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/goodsInfo/all',
+            downloading: false,
+            showDialog: false,
+            formData: {},
+            edit: false,
+            saving: false,
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/goodsInfoEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        /*editRow(row) {
+            this.$router.push({
+                path: '/goodsInfoEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },*/
+        editRow(row, edit) {
+            this.edit = edit;
+            if (!row) {
+                row = {
+                    name: '',
+                    price: ''
+                };
+            }
+            this.formData = { ...row };
+            this.showDialog = true;
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/goodsInfo/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/goodsInfo/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        save() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    let data = { ...this.formData };
+                    this.saving = true;
+                    this.$http
+                        .post('/goodsInfo/save', data, { body: 'json' })
+                        .then(res => {
+                            this.saving = false;
+                            this.$message.success('成功');
+                            this.showDialog = false;
+                            this.getData();
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.saving = false;
+                            this.showDialog = false;
+                            this.$message.error(e.error);
+                        });
+                } else {
+                    return false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/SetGoodsEdit.vue

@@ -0,0 +1,132 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="66px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="setId" label="setId">
+                <el-input-number type="number" v-model="formData.setId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="enName" label="英文名">
+                <el-input v-model="formData.enName"></el-input>
+            </el-form-item>
+            <el-form-item prop="num" label="数量">
+                <el-input-number type="number" v-model="formData.num"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="unit" label="单位">
+                <el-input v-model="formData.unit"></el-input>
+            </el-form-item>
+            <el-form-item prop="price" label="价格">
+                <el-input-number type="number" v-model="formData.price"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'SetGoodsEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('setGoods/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入数量',
+                        trigger: 'blur'
+                    }
+                ],
+                unit: [
+                    {
+                        required: true,
+                        message: '请输入单位',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/setGoods/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setGoods/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/SetGoodsList.vue

@@ -0,0 +1,169 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="setId" label="setId"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="enName" label="英文名"> </el-table-column>
+            <el-table-column prop="num" label="数量"> </el-table-column>
+            <el-table-column prop="unit" label="单位"> </el-table-column>
+            <el-table-column prop="price" label="价格"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button
+                        @click="$router.push({ path: '/GoodsInfoList', query: { column: row.name + ',name' } })"
+                        type="primary"
+                        size="small"
+                        plain
+                        >select
+                    </el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'SetGoodsList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/setGoods/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/setGoodsEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/setGoodsEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/setGoods/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setGoods/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/SetInfoEdit.vue

@@ -0,0 +1,198 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="套餐名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="title" label="标题">
+                <el-input v-model="formData.title"></el-input>
+            </el-form-item>
+            <el-form-item prop="img" label="图">
+                <multi-upload v-model="formData.img"></multi-upload>
+            </el-form-item>
+            <el-form-item prop="tag" label="套餐标签">
+                <el-tag
+                    :key="tag"
+                    v-for="tag in dynamicTags"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose(tag)"
+                    size="medium"
+                >
+                    {{ tag }}
+                </el-tag>
+                <el-input
+                    class="input-new-tag"
+                    v-if="inputVisible"
+                    v-model="inputValue"
+                    ref="saveTagInput"
+                    size="small"
+                    @keyup.enter.native="handleInputConfirm"
+                    @blur="handleInputConfirm"
+                >
+                </el-input>
+                <el-button v-else class="button-new-tag" size="small" @click="showInput">新建标签</el-button>
+            </el-form-item>
+            <el-form-item prop="amount" label="金额">
+                <el-input-number type="number" v-model="formData.amount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="detail" label="详情">
+                <rich-text v-model="formData.detail"></rich-text>
+            </el-form-item>
+            <el-form-item prop="type" label="套餐类型">
+                <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'SetInfoEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('setInfo/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                    dynamicTags = res.tag.split(',');
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入套餐名称',
+                        trigger: 'blur'
+                    }
+                ],
+                amount: [
+                    {
+                        required: true,
+                        message: '请输入金额',
+                        trigger: 'blur'
+                    }
+                ],
+                type: [
+                    {
+                        required: true,
+                        message: '请输入套餐类型',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            typeOptions: [
+                { label: '团队', value: 'TEAM' },
+                { label: '个人', value: 'PERSONAL' }
+            ],
+            dynamicTags: [],
+            inputVisible: false,
+            inputValue: ''
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            data.tag = this.dynamicTags.join(',');
+            this.saving = true;
+            this.$http
+                .post('/setInfo/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setInfo/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        handleClose(tag) {
+            this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+        },
+
+        showInput() {
+            this.inputVisible = true;
+            this.$nextTick(_ => {
+                this.$refs.saveTagInput.$refs.input.focus();
+            });
+        },
+
+        handleInputConfirm() {
+            let inputValue = this.inputValue;
+            if (inputValue) {
+                this.dynamicTags.push(inputValue);
+            }
+            this.inputVisible = false;
+            this.inputValue = '';
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.el-tag + .el-tag {
+    margin-left: 10px;
+}
+.button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+}
+.input-new-tag {
+    width: 100px;
+    margin-left: 10px;
+    vertical-align: bottom;
+}
+</style>

src/main/vue/src/views/SetInfoList.vue

@@ -0,0 +1,185 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="60"> </el-table-column>
+            <el-table-column prop="name" label="套餐名称" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="title" label="标题" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="img" label="图">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="splImg(row.img)[0]"
+                        fit="cover"
+                        :preview-src-list="splImg(row.img)"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="tag" label="套餐标签" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="amount" label="金额(元)"> </el-table-column>
+            <el-table-column prop="detail" label="详情"> </el-table-column>
+            <el-table-column prop="type" label="套餐类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'SetInfoList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/setInfo/all',
+            downloading: false,
+            typeOptions: [
+                { label: '团队', value: 'TEAM' },
+                { label: '个人', value: 'PERSONAL' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/setInfoEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/setInfoEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/setInfo/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/setInfo/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        splImg(row) {
+            return row != null ? row.split(',') : [];
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/WithdrawEdit.vue

@@ -0,0 +1,136 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="userId" label="用户ID">
+                <el-input-number type="number" v-model="formData.userId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="amount" label="提现金额">
+                <el-input-number type="number" v-model="formData.amount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="auditTime" label="审核时间">
+                <el-date-picker
+                    v-model="formData.auditTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期时间"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="payMethod" label="提现方式">
+                <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in payMethodOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="status" label="提现状态">
+                <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="account" label="账号">
+                <el-input v-model="formData.account"></el-input>
+            </el-form-item>
+            <el-form-item prop="realName" label="真实姓名">
+                <el-input v-model="formData.realName"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'WithdrawEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('withdraw/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ],
+            statusOptions: [
+                { label: '提现成功', value: 'SUCCESS' },
+                { label: '提现失败', value: 'FAIL' },
+                { label: '待处理', value: 'PENDING' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/withdraw/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/withdraw/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/WithdrawList.vue

@@ -0,0 +1,185 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID"> </el-table-column>
+            <el-table-column prop="amount" label="提现金额"> </el-table-column>
+            <el-table-column prop="auditTime" label="审核时间"> </el-table-column>
+            <el-table-column prop="payMethod" label="提现方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="status" label="提现状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="account" label="账号"> </el-table-column>
+            <el-table-column prop="realName" label="真实姓名"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'WithdrawList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/withdraw/all',
+            downloading: false,
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ],
+            statusOptions: [
+                { label: '提现成功', value: 'SUCCESS' },
+                { label: '提现失败', value: 'FAIL' },
+                { label: '待处理', value: 'PENDING' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        payMethodFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payMethodOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/withdrawEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/withdrawEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/withdraw/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/withdraw/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/test/java/com/izouma/jiashanxia/repo/UserRepoTest.java

@@ -1,6 +1,7 @@
 package com.izouma.jiashanxia.repo;
 
 import com.izouma.jiashanxia.domain.User;
+import com.izouma.jiashanxia.enums.AuthorityName;
 import com.izouma.jiashanxia.security.Authority;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Collections;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
@@ -20,9 +22,10 @@ public class UserRepoTest {
     @Test
     public void testUser() {
         User user = User.builder()
-                .username("testuser")
-                .password("123")
+                .username("root")
+                .password(new BCryptPasswordEncoder().encode("123456"))
                 .avatar("")
+                .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_ADMIN)))
                 .build();
         userRepo.save(user);
     }
@@ -31,7 +34,8 @@ public class UserRepoTest {
     public void createUser() {
 
         User user = userRepo.findByUsername("root");
-        user.setPassword(new BCryptPasswordEncoder().encode("123456"));
+//        user.setPassword(new BCryptPasswordEncoder().encode("123456"));
+        user.setAuthorities(Collections.singleton(Authority.builder().name("ROLE_ADMIN").build()));
         userRepo.save(user);
     }