订单

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

@@ -23,10 +23,15 @@ public class GoodsInfo {
 
     private String name;
 
-
     @ApiModelProperty(value = "价格", name = "price")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "单位", name = "unit")
+    private String unit;
+
+//    @ApiModelProperty(value = "是否下架", name = "isOffShelf")
+//    private Boolean isOffShelf;
+
     @Builder.Default
     @Column(nullable = false)
     private Boolean del = false;

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

@@ -9,12 +9,17 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
 @ApiModel(value = "订单")
 public class OrderInfo extends BaseEntity {
 
@@ -26,13 +31,23 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "支付时间")
     private LocalDateTime paidAt;
 
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "订单状态")
     private OrderInfoStatus status;
 
     @ApiModelProperty(value = "订单号")
+    private String orderNumber;
+
+    @ApiModelProperty(value = "交易单号")
     private String transactionId;
 
+    @ApiModelProperty(value = "名称")
+    private String name;
+
     @ApiModelProperty(value = "充值套餐")
-    private String setId;
+    private Long setMealId;
+
+    @ApiModelProperty(value = "价钱")
+    private BigDecimal price;
 
 }

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

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import java.math.BigDecimal;
@@ -16,13 +17,14 @@ import java.math.BigDecimal;
 @Builder
 @Entity
 @ApiModel(value = "套餐商品")
+@Where(clause = "del = 0")
 public class SetGoods extends BaseEntity {
-    private Long setId;
+    private Long setMealId;
 
     @ApiModelProperty(value = "名称")
     private String name;
 
-    private String enName;
+    private Long goodsInfoId;
 
     @ApiModelProperty(value = "数量")
     private Integer num;

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

@@ -18,7 +18,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "套餐信息")
-public class SetInfo extends BaseEntity {
+public class SetMeal extends BaseEntity {
 
     @ApiModelProperty(value = "套餐名称")
     private String name;

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

@@ -71,4 +71,6 @@ public class User extends BaseEntity implements Serializable {
     private String email;
 
     private BigDecimal amount;
+
+    private Long parent;
 }

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

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 
@@ -15,20 +16,21 @@ import javax.persistence.Entity;
 @Builder
 @Entity
 @ApiModel(value = "用户套餐")
+@Where(clause = "del = 0")
 public class UserSet extends BaseEntity {
 
     private Long userId;
 
-    @ApiModelProperty(value = "名称")
-    private String name;
+//    @ApiModelProperty(value = "名称")
+//    private String name;
 
-    private String enName;
+    private Long goodsInfoId;
 
     @ApiModelProperty(value = "数量")
     private Integer num;
 
-    @ApiModelProperty(value = "单位")
-    private String unit;
+//    @ApiModelProperty(value = "单位")
+//    private String unit;
 
     private String remark;
 

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

@@ -0,0 +1,27 @@
+package com.izouma.jiashanxia.domain;
+
+import com.izouma.jiashanxia.enums.FlowType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class UserSetFlow extends BaseEntity {
+    private Long userId;
+
+    @Enumerated(EnumType.STRING)
+    private FlowType type;
+
+    @Column(columnDefinition = "TEXT")
+    private String content;
+}

src/main/java/com/izouma/jiashanxia/dto/GoodsDTO.java

@@ -0,0 +1,6 @@
+package com.izouma.jiashanxia.dto;
+
+public class GoodsDTO {
+    private Long goodsInfoId;
+    private Long num;
+}

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

@@ -0,0 +1,12 @@
+package com.izouma.jiashanxia.enums;
+
+public enum FlowType {
+    /*
+    购买
+     */
+    BUY,
+    /*
+    核销
+     */
+    WRITE_OFF
+}

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

@@ -0,0 +1,19 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.OrderInfo;
+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 OrderInfoRepo extends JpaRepository<OrderInfo, Long>, JpaSpecificationExecutor<OrderInfo> {
+    @Query("update OrderInfo t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    @Query(nativeQuery = true, value = "SELECT count(1) FROM order_info")
+    int orderNum();
+}

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

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 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);
+
+    List<SetGoods> findAllBySetMealId(Long setId);
 }

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

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.repo;
 
-import com.izouma.jiashanxia.domain.SetInfo;
+import com.izouma.jiashanxia.domain.SetMeal;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -8,8 +8,8 @@ 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")
+public interface SetMealRepo extends JpaRepository<SetMeal, Long>, JpaSpecificationExecutor<SetMeal> {
+    @Query("update SetMeal t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);

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

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.UserSetFlow;
+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;
+import java.util.List;
+
+
+public interface UserSetFlowRepo extends JpaRepository<UserSetFlow, Long>, JpaSpecificationExecutor<UserSetFlow> {
+    @Query("update UserSetFlow t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<UserSetFlow> findAllByUserId(Long userId);
+}

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

@@ -0,0 +1,19 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.UserSet;
+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;
+import java.util.List;
+
+public interface UserSetRepo extends JpaRepository<UserSet, Long>, JpaSpecificationExecutor<UserSet> {
+    @Query("update UserSet t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<UserSet> findAllByUserId(Long userId);
+}

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

@@ -0,0 +1,104 @@
+package com.izouma.jiashanxia.service;
+
+import cn.hutool.core.collection.CollUtil;
+import com.izouma.jiashanxia.domain.*;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.enums.OrderInfoStatus;
+import com.izouma.jiashanxia.enums.PayMethod;
+import com.izouma.jiashanxia.enums.TransactionType;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.*;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+
+@Service
+@AllArgsConstructor
+public class OrderInfoService {
+
+    private OrderInfoRepo        orderInfoRepo;
+    private SetMealRepo          setMealRepo;
+    private SetGoodsRepo         setGoodsRepo;
+    private UserSetRepo          userSetRepo;
+    private UserRepo             userRepo;
+    private SysConfigService     sysConfigService;
+    private CommissionRecordRepo commissionRecordRepo;
+    private UserSetService       userSetService;
+
+    public Page<OrderInfo> all(PageQuery pageQuery) {
+        return orderInfoRepo.findAll(JpaUtils.toSpecification(pageQuery, OrderInfo.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /*
+    下订单
+     */
+    public OrderInfo order(Long userId, Long setInfoId, PayMethod payMethod) {
+        SetMeal setInfo = setMealRepo.findById(setInfoId).orElseThrow(new BusinessException("无套餐"));
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String localTime = df.format(LocalDateTime.now());
+        String num = String.format("%05d", orderInfoRepo.orderNum() + 1);
+
+        OrderInfo order = OrderInfo.builder()
+                .setMealId(setInfoId)
+                .status(OrderInfoStatus.UNPAID)
+                .userId(userId)
+                .payMethod(payMethod)
+                .orderNumber(localTime + num)
+                .price(setInfo.getAmount())
+                .name(setInfo.getName())
+                .build();
+        return orderInfoRepo.save(order);
+    }
+
+    /*
+    完成付款
+     */
+    public void completed(Long orderInfoId, String transactionId) {
+        // 修改订单状态
+        OrderInfo order = orderInfoRepo.findById(orderInfoId).orElseThrow(new BusinessException("无订单"));
+        order.setStatus(OrderInfoStatus.PAID);
+        order.setTransactionId(transactionId);
+        order.setPaidAt(LocalDateTime.now());
+        orderInfoRepo.save(order);
+
+        // 套餐内商品
+        List<SetGoods> setGoodsList = setGoodsRepo.findAllBySetMealId(order.getSetMealId());
+        // 加入套餐商品
+        Long userId = order.getUserId();
+        userSetService.joinUserSet(userId, setGoodsList);
+
+    }
+
+    /*
+    分销
+     */
+    public void distribution(Long userId, Long parent, String transactionId) {
+        List<UserSet> parentSets = userSetRepo.findAllByUserId(parent);
+        if (CollUtil.isEmpty(parentSets)) {
+            return;
+        }
+
+        User user = userRepo.findById(parent).orElseThrow(new BusinessException("无用户"));
+        BigDecimal personalAmount = sysConfigService.getBigDecimal("PERSONAL_AMOUNT");
+        user.setAmount(user.getAmount().add(personalAmount));
+
+        // 个人佣金流水
+        commissionRecordRepo.save(CommissionRecord.builder()
+                .userId(parent)
+                .amount(personalAmount)
+                .payMethod(PayMethod.YUE)
+                .fromUserId(userId)
+                .transactionType(TransactionType.INCOME)
+                .transactionId(transactionId)
+                .build());
+
+
+    }
+}

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

@@ -1,13 +1,21 @@
 package com.izouma.jiashanxia.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.domain.UserSet;
+import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.dto.GoodsDTO;
 import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.enums.FlowType;
 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;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class SetGoodsService {

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

@@ -1,20 +0,0 @@
-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/SetMealService.java

@@ -0,0 +1,44 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.domain.SetMeal;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.enums.SetType;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.SetGoodsRepo;
+import com.izouma.jiashanxia.repo.SetMealRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@AllArgsConstructor
+public class SetMealService {
+
+    private SetMealRepo    setMealRepo;
+    private SetGoodsRepo   setGoodsRepo;
+    private UserSetService userSetService;
+
+    public Page<SetMeal> all(PageQuery pageQuery) {
+        return setMealRepo.findAll(JpaUtils.toSpecification(pageQuery, SetMeal.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /*
+    开通团队套餐
+     */
+    public void openTeamSet(Long userId, Long setMealId) {
+        SetMeal set = setMealRepo.findById(setMealId).orElseThrow(new BusinessException("无套餐"));
+        if (!SetType.TEAM.equals(set.getType())) {
+            throw new BusinessException("不是团队套餐");
+        }
+
+        // 加入套餐商品
+        List<SetGoods> setGoodsList = setGoodsRepo.findAllBySetMealId(setMealId);
+        userSetService.joinUserSet(userId, setGoodsList);
+
+    }
+}

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

@@ -3,6 +3,7 @@ package com.izouma.jiashanxia.service;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.jiashanxia.config.Constants;
 import com.izouma.jiashanxia.domain.User;
 import com.izouma.jiashanxia.dto.PageQuery;
@@ -28,6 +29,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -82,13 +84,18 @@ public class UserService {
         return user;
     }
 
-    public User loginMa(String code) {
+    public User loginMa(String code, Long parent) {
         try {
             WxMaJscode2SessionResult result = wxMaService.jsCode2SessionInfo(code);
             String openId = result.getOpenid();
             String sessionKey = result.getSessionKey();
             User userInfo = userRepo.findByOpenId(openId);
             if (userInfo != null) {
+                // 上级不为空 && 用户上级为空
+                if (ObjectUtil.isNotEmpty(parent) && ObjectUtil.isNull(userInfo.getParent())) {
+                    userInfo.setParent(parent);
+                    userRepo.save(userInfo);
+                }
                 return userInfo;
             }
             userInfo = User.builder()
@@ -97,6 +104,8 @@ public class UserService {
                     .openId(openId)
                     .avatar(Constants.DEFAULT_AVATAR)
                     .authorities(Collections.singleton(Authority.builder().name("ROLE_USER").build()))
+                    .parent(parent)
+                    .amount(BigDecimal.ZERO)
                     .build();
             userInfo = userRepo.save(userInfo);
             return userInfo;

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

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

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

@@ -0,0 +1,67 @@
+package com.izouma.jiashanxia.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.domain.UserSet;
+import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.dto.GoodsDTO;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.enums.FlowType;
+import com.izouma.jiashanxia.repo.UserSetFlowRepo;
+import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class UserSetService {
+
+    private UserSetRepo     userSetRepo;
+    private UserSetFlowRepo userSetFlowRepo;
+
+    public Page<UserSet> all(PageQuery pageQuery) {
+        return userSetRepo.findAll(JpaUtils.toSpecification(pageQuery, UserSet.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /*
+    加入套餐
+    */
+    public void joinUserSet(Long userId, List<SetGoods> setGoodsList) {
+        // 用户已有套餐
+        Map<Long, UserSet> userSetMap = userSetRepo.findAllByUserId(userId)
+                .stream()
+                .collect(Collectors.toMap(UserSet::getGoodsInfoId, userSet -> userSet));
+
+        // 加入用户套餐
+        setGoodsList.forEach(setGoods -> {
+            UserSet goods = userSetMap.get(setGoods.getGoodsInfoId());
+            if (ObjectUtil.isNotEmpty(goods)) {
+                goods.setNum(goods.getNum() + setGoods.getNum());
+                goods.setRemark(setGoods.getRemark());
+            } else {
+                goods = UserSet.builder()
+                        .userId(userId)
+                        .goodsInfoId(setGoods.getGoodsInfoId())
+                        .num(setGoods.getNum())
+                        .remark(setGoods.getRemark())
+                        .build();
+            }
+            userSetRepo.save(goods);
+        });
+
+        // 记录套餐流水
+        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(setGoodsList), GoodsDTO.class);
+        userSetFlowRepo.save(UserSetFlow.builder()
+                .userId(userId)
+                .type(FlowType.BUY)
+                .content(JSONObject.toJSONString(goodsDTOS))
+                .build());
+    }
+}

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

@@ -74,9 +74,9 @@ public class AuthenticationController {
 
     @PostMapping("/maLogin")
     @ApiOperation(value = "小程序登录")
-    public String maLogin(String code) {
+    public String maLogin(String code, Long parent) {
         try {
-            User user = userService.loginMa(code);
+            User user = userService.loginMa(code, parent);
             return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
         } catch (Exception e) {
             log.error("loginByCode", e);

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

@@ -1,4 +1,5 @@
 package com.izouma.jiashanxia.web;
+
 import com.izouma.jiashanxia.domain.GoodsInfo;
 import com.izouma.jiashanxia.service.GoodsInfoService;
 import com.izouma.jiashanxia.dto.PageQuery;
@@ -20,7 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class GoodsInfoController extends BaseController {
     private GoodsInfoService goodsInfoService;
-    private GoodsInfoRepo goodsInfoRepo;
+    private GoodsInfoRepo    goodsInfoRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -40,6 +41,11 @@ public class GoodsInfoController extends BaseController {
         return goodsInfoService.all(pageQuery);
     }
 
+    @PostMapping("/allList")
+    public List<GoodsInfo> allList() {
+        return goodsInfoRepo.findAll();
+    }
+
     @GetMapping("/get/{id}")
     public GoodsInfo get(@PathVariable Long id) {
         return goodsInfoRepo.findById(id).orElseThrow(new BusinessException("无记录"));

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

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.OrderInfo;
+import com.izouma.jiashanxia.service.OrderInfoService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.OrderInfoRepo;
+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("/orderInfo")
+@AllArgsConstructor
+public class OrderInfoController extends BaseController {
+    private OrderInfoService orderInfoService;
+    private OrderInfoRepo orderInfoRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public OrderInfo save(@RequestBody OrderInfo record) {
+        if (record.getId() != null) {
+            OrderInfo orig = orderInfoRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return orderInfoRepo.save(orig);
+        }
+        return orderInfoRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<OrderInfo> all(@RequestBody PageQuery pageQuery) {
+        return orderInfoService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public OrderInfo get(@PathVariable Long id) {
+        return orderInfoRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        orderInfoRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<OrderInfo> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -1,4 +1,5 @@
 package com.izouma.jiashanxia.web;
+
 import com.izouma.jiashanxia.domain.SetGoods;
 import com.izouma.jiashanxia.service.SetGoodsService;
 import com.izouma.jiashanxia.dto.PageQuery;
@@ -6,6 +7,7 @@ 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 io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +22,7 @@ import java.util.List;
 @AllArgsConstructor
 public class SetGoodsController extends BaseController {
     private SetGoodsService setGoodsService;
-    private SetGoodsRepo setGoodsRepo;
+    private SetGoodsRepo    setGoodsRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -56,5 +58,11 @@ public class SetGoodsController extends BaseController {
         List<SetGoods> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PostMapping("/getSetGoods")
+    @ApiOperation("获取套餐内商品信息")
+    public List<SetGoods> getSetGoods(@RequestParam Long setId) {
+        return setGoodsRepo.findAllBySetMealId(setId);
+    }
 }
 

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

@@ -1,14 +1,14 @@
 package com.izouma.jiashanxia.web;
-import com.izouma.jiashanxia.domain.SetInfo;
-import com.izouma.jiashanxia.service.SetInfoService;
+
+import com.izouma.jiashanxia.domain.SetMeal;
+import com.izouma.jiashanxia.service.SetMealService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
-import com.izouma.jiashanxia.repo.SetInfoRepo;
+import com.izouma.jiashanxia.repo.SetMealRepo;
 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;
@@ -16,44 +16,44 @@ import java.io.IOException;
 import java.util.List;
 
 @RestController
-@RequestMapping("/setInfo")
+@RequestMapping("/setMeal")
 @AllArgsConstructor
-public class SetInfoController extends BaseController {
-    private SetInfoService setInfoService;
-    private SetInfoRepo setInfoRepo;
+public class SetMealController extends BaseController {
+    private SetMealService setMealService;
+    private SetMealRepo    setMealRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public SetInfo save(@RequestBody SetInfo record) {
+    public SetMeal save(@RequestBody SetMeal record) {
         if (record.getId() != null) {
-            SetInfo orig = setInfoRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            SetMeal orig = setMealRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return setInfoRepo.save(orig);
+            return setMealRepo.save(orig);
         }
-        return setInfoRepo.save(record);
+        return setMealRepo.save(record);
     }
 
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<SetInfo> all(@RequestBody PageQuery pageQuery) {
-        return setInfoService.all(pageQuery);
+    public Page<SetMeal> all(@RequestBody PageQuery pageQuery) {
+        return setMealService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
-    public SetInfo get(@PathVariable Long id) {
-        return setInfoRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public SetMeal get(@PathVariable Long id) {
+        return setMealRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-        setInfoRepo.softDelete(id);
+        setMealRepo.softDelete(id);
     }
 
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<SetInfo> data = all(pageQuery).getContent();
+        List<SetMeal> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
 }

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

@@ -25,7 +25,7 @@ public class SysConfigController extends BaseController {
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    @CacheEvict(value = {"SysConfigServiceGetBigDecimal", "SysConfigServiceGetTime", "SysConfigServiceGetBoolean", "SysConfigServiceGetInt"}, allEntries = true)
+//    @CacheEvict(value = {"SysConfigServiceGetBigDecimal", "SysConfigServiceGetTime", "SysConfigServiceGetBoolean", "SysConfigServiceGetInt"}, allEntries = true)
     public SysConfig save(@RequestBody SysConfig record) {
         return sysConfigRepo.save(record);
     }

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

@@ -0,0 +1,67 @@
+package com.izouma.jiashanxia.web;
+
+import com.izouma.jiashanxia.domain.UserSet;
+import com.izouma.jiashanxia.service.UserSetService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.SecurityUtils;
+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("/userSet")
+@AllArgsConstructor
+public class UserSetController extends BaseController {
+    private UserSetService userSetService;
+    private UserSetRepo    userSetRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public UserSet save(@RequestBody UserSet record) {
+        if (record.getId() != null) {
+            UserSet orig = userSetRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return userSetRepo.save(orig);
+        }
+        return userSetRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<UserSet> all(@RequestBody PageQuery pageQuery) {
+        return userSetService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public UserSet get(@PathVariable Long id) {
+        return userSetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        userSetRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<UserSet> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/my")
+    public List<UserSet> my() {
+        return userSetRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
+    }
+}
+

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

@@ -0,0 +1,67 @@
+package com.izouma.jiashanxia.web;
+
+import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.service.UserSetFlowService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.UserSetFlowRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.SecurityUtils;
+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("/userSetFlow")
+@AllArgsConstructor
+public class UserSetFlowController extends BaseController {
+    private UserSetFlowService userSetFlowService;
+    private UserSetFlowRepo    userSetFlowRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public UserSetFlow save(@RequestBody UserSetFlow record) {
+        if (record.getId() != null) {
+            UserSetFlow orig = userSetFlowRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return userSetFlowRepo.save(orig);
+        }
+        return userSetFlowRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<UserSetFlow> all(@RequestBody PageQuery pageQuery) {
+        return userSetFlowService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public UserSetFlow get(@PathVariable Long id) {
+        return userSetFlowRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        userSetFlowRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<UserSetFlow> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/my")
+    public List<UserSetFlow> my() {
+        return userSetFlowRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
+    }
+}
+

src/main/resources/genjson/OrderInfo.json

@@ -0,0 +1 @@
+{"tableName":"OrderInfo","className":"OrderInfo","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":"userId","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":"paidAt","modelName":"paidAt","remark":"支付时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"status","modelName":"status","remark":"订单状态","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"未支付\",\"value\":\"UNPAID\"},{\"label\":\"已支付\",\"value\":\"PAID\"},{\"label\":\"已取消\",\"value\":\"CANCELLED\"}]"},{"name":"transactionId","modelName":"transactionId","remark":"订单号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"setId","modelName":"setId","remark":"充值套餐","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.OrderInfo"}

src/main/resources/genjson/UserSet.json

@@ -0,0 +1 @@
+{"tableName":"UserSet","className":"UserSet","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":"userId","showInList":true,"showInForm":true,"formType":"number"},{"name":"goodsInfoId","modelName":"goodsInfoId","remark":"goodsInfoId","showInList":true,"showInForm":true,"formType":"number"},{"name":"num","modelName":"num","remark":"数量","showInList":true,"showInForm":true,"formType":"number"},{"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.UserSet"}

src/main/resources/genjson/UserSetFlow.json

@@ -0,0 +1 @@
+{"tableName":"UserSetFlow","className":"UserSetFlow","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":"userId","showInList":true,"showInForm":true,"formType":"number"},{"name":"type","modelName":"type","remark":"类型","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"购买\",\"value\":\"BUY\"},{\"label\":\"核销\",\"value\":\"WRITE_OFF\"}]"},{"name":"content","modelName":"content","remark":"内容","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.UserSetFlow"}

src/main/vue/src/components/SetGoodsTable.vue

@@ -0,0 +1,225 @@
+<template>
+    <div>
+        <el-table :data="setList" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="name" label="名称" min-width="120px"> </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="备注" min-width="100px"> </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">
+            <el-button @click="editRow()" type="primary">添加</el-button>
+            <el-button @click="$router.go(-1)">取消</el-button>
+        </div>
+
+        <el-dialog :visible.sync="showDialog" width="500px" title="套餐内商品" :close-on-click-modal="false">
+            <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small">
+                <el-form-item prop="goodsInfoId" label="名称">
+                    <el-select v-model="formData.goodsInfoId" filterable @change="optionChange" class="cl-input">
+                        <el-option v-for="item in goodsList" :key="item.id" :value="item.id" :label="item.name">
+                            <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.unit }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="num" label="数量">
+                    <el-input-number type="number" v-model="formData.num" class="cl-input" :min="1"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="remark" label="备注">
+                    <el-input v-model="formData.remark" class="cl-input"></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>
+export default {
+    name: 'SetGoodsTable',
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            id: '',
+            setList: [],
+            showDialog: false,
+            formData: {},
+            saving: false,
+            rules: {
+                goodsInfoId: [
+                    {
+                        required: true,
+                        message: '请选择商品',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入数量',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            goodsList: [],
+            goods: {}
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    mounted() {
+        this.$http
+            .post('goodsInfo/allList')
+            .then(res => {
+                this.goodsList = res;
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    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, edit) {
+            this.edit = edit;
+            if (!row) {
+                row = {
+                    name: '',
+                    price: ''
+                };
+            }
+            this.formData = { ...row };
+            this.showDialog = true;
+        },
+        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);
+                    }
+                });
+        },
+        getList(id) {
+            if (id) {
+                this.id = id;
+            }
+            this.$http
+                .post('/setGoods/getSetGoods', {
+                    setId: this.id
+                })
+                .then(res => {
+                    this.setList = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                });
+        },
+        save() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    let data = { ...this.formData };
+                    data.unit = this.goods.unit;
+                    data.price = this.goods.price * data.num;
+                    data.setMealId = this.id;
+                    data.name = this.goods.name;
+                    this.saving = true;
+                    this.$http
+                        .post('/setGoods/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;
+                }
+            });
+        },
+        optionChange(id) {
+            this.goods = this.goodsList.find(item => {
+                return item.id === id;
+            });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.cl-input {
+    width: 300px;
+}
+</style>

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

@@ -67,10 +67,12 @@ export default {
     created() {
         if (this.$route.query.id) {
             this.$http
-                .get('setInfo/get/' + this.$route.query.id)
+                .get('setMeal/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
-                    dynamicTags = res.tag.split(',');
+                    if (res.tag !== '') {
+                        this.dynamicTags = res.tag.split(',');
+                    }
                 })
                 .catch(e => {
                     console.log(e);
@@ -129,7 +131,7 @@ export default {
             data.tag = this.dynamicTags.join(',');
             this.saving = true;
             this.$http
-                .post('/setInfo/save', data, { body: 'json' })
+                .post('/setMeal/save', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
@@ -144,7 +146,7 @@ export default {
         onDelete() {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/setInfo/del/${this.formData.id}`);
+                    return this.$http.post(`/setMeal/del/${this.formData.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/router.js

@@ -138,17 +138,17 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/setInfoEdit',
-                    name: 'SetInfoEdit',
-                    component: () => import(/* webpackChunkName: "setInfoEdit" */ '@/views/SetInfoEdit.vue'),
+                    path: '/setMealEdit',
+                    name: 'SetMealEdit',
+                    component: () => import(/* webpackChunkName: "setInfoEdit" */ '@/views/SetMealEdit.vue'),
                     meta: {
                         title: '套餐信息编辑'
                     }
                 },
                 {
-                    path: '/setInfoList',
-                    name: 'SetInfoList',
-                    component: () => import(/* webpackChunkName: "setInfoList" */ '@/views/SetInfoList.vue'),
+                    path: '/setMealList',
+                    name: 'SetMealList',
+                    component: () => import(/* webpackChunkName: "setInfoList" */ '@/views/SetMealList.vue'),
                     meta: {
                         title: '套餐信息'
                     }
@@ -176,6 +176,54 @@ const router = new Router({
                     meta: {
                         title: '套餐内商品'
                     }
+                },
+                {
+                    path: '/orderInfoEdit',
+                    name: 'OrderInfoEdit',
+                    component: () => import(/* webpackChunkName: "orderInfoEdit" */ '@/views/OrderInfoEdit.vue'),
+                    meta: {
+                        title: '订单管理编辑'
+                    }
+                },
+                {
+                    path: '/orderInfoList',
+                    name: 'OrderInfoList',
+                    component: () => import(/* webpackChunkName: "orderInfoList" */ '@/views/OrderInfoList.vue'),
+                    meta: {
+                        title: '订单管理'
+                    }
+                },
+                {
+                    path: '/userSetEdit',
+                    name: 'UserSetEdit',
+                    component: () => import(/* webpackChunkName: "userSetEdit" */ '@/views/UserSetEdit.vue'),
+                    meta: {
+                        title: '用户套餐编辑'
+                    }
+                },
+                {
+                    path: '/userSetList',
+                    name: 'UserSetList',
+                    component: () => import(/* webpackChunkName: "userSetList" */ '@/views/UserSetList.vue'),
+                    meta: {
+                        title: '用户套餐'
+                    }
+                },
+                {
+                    path: '/userSetFlowEdit',
+                    name: 'UserSetFlowEdit',
+                    component: () => import(/* webpackChunkName: "userSetFlowEdit" */ '@/views/UserSetFlowEdit.vue'),
+                    meta: {
+                        title: '用户套餐流水编辑'
+                    }
+                },
+                {
+                    path: '/userSetFlowList',
+                    name: 'UserSetFlowList',
+                    component: () => import(/* webpackChunkName: "userSetFlowList" */ '@/views/UserSetFlowList.vue'),
+                    meta: {
+                        title: '用户套餐流水'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

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

@@ -25,8 +25,9 @@
         >
             <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="name" label="名称" min-width="120px"> </el-table-column>
             <el-table-column prop="price" label="价格(元)"> </el-table-column>
+            <el-table-column prop="unit" 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>
@@ -56,13 +57,16 @@
             </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-dialog :visible.sync="showDialog" width="460px" title="编辑商品" :close-on-click-modal="false">
+            <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small">
                 <el-form-item prop="name" label="名称">
-                    <el-input v-model="formData.name"></el-input>
+                    <el-input v-model="formData.name" class="cl-input"></el-input>
                 </el-form-item>
                 <el-form-item prop="price" label="价格">
-                    <el-input v-model="formData.price"></el-input>
+                    <el-input-number v-model="formData.price" class="cl-input"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="unit" label="单位">
+                    <el-input v-model="formData.unit" class="cl-input"></el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer">
@@ -89,13 +93,8 @@ export default {
             edit: false,
             saving: false,
             rules: {
-                name: [
-                    {
-                        required: true,
-                        message: '请输入名称',
-                        trigger: 'blur'
-                    }
-                ]
+                name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+                unit: [{ required: true, message: '请输入单位', trigger: 'blur' }]
             }
         };
     },
@@ -216,4 +215,8 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.cl-input {
+    width: 250px;
+}
+</style>

src/main/vue/src/views/OrderInfoEdit.vue

@@ -0,0 +1,151 @@
+<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="userId">
+                <el-input-number type="number" v-model="formData.userId"></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="paidAt" label="支付时间">
+                <el-date-picker
+                    v-model="formData.paidAt"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期时间"
+                >
+                </el-date-picker>
+            </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="transactionId" label="订单号">
+                <el-input v-model="formData.transactionId"></el-input>
+            </el-form-item>
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="setId" label="充值套餐">
+                <el-input v-model="formData.setId"></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: 'OrderInfoEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('orderInfo/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: {
+                userId: [
+                    {
+                        required: true,
+                        message: '请输入userId',
+                        trigger: 'blur'
+                    }
+                ],
+                status: [
+                    {
+                        required: true,
+                        message: '请输入订单状态',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ],
+            statusOptions: [
+                { label: '未支付', value: 'UNPAID' },
+                { label: '已支付', value: 'PAID' },
+                { label: '已取消', value: 'CANCELLED' }
+            ]
+        };
+    },
+    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('/orderInfo/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(`/orderInfo/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/OrderInfoList.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="orderNumber" label="订单号" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="userId" label="userId"> </el-table-column>
+            <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="paidAt" label="支付时间"> </el-table-column>
+            <el-table-column prop="status" label="订单状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="name" label="名称" show-overflow-tooltip> </el-table-column>
+            <!--<el-table-column prop="setId" 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: 'OrderInfoList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/orderInfo/all',
+            downloading: false,
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '余额', value: 'YUE' }
+            ],
+            statusOptions: [
+                { label: '未支付', value: 'UNPAID' },
+                { label: '已支付', value: 'PAID' },
+                { label: '已取消', value: 'CANCELLED' }
+            ]
+        };
+    },
+    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: '/orderInfoEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/orderInfoEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/orderInfo/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(`/orderInfo/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/SetGoodsEdit.vue

@@ -12,12 +12,15 @@
             <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 prop="goodsInfoId" label="名称">
+                <!--<el-input v-model="formData.name"></el-input>-->
+                <el-select v-model="formData.goodsInfoId" filterable @change="optionChange">
+                    <el-option v-for="item in goodsList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
             </el-form-item>
+            <!--<el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name"></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>
@@ -53,16 +56,25 @@ export default {
                     this.$message.error(e.error);
                 });
         }
+        this.$http
+            .post('goodsInfo/allList')
+            .then(res => {
+                this.goodsList = res;
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
     },
     data() {
         return {
             saving: false,
             formData: {},
             rules: {
-                name: [
+                goodsInfoId: [
                     {
                         required: true,
-                        message: '请输入名称',
+                        message: '请选择商品',
                         trigger: 'blur'
                     }
                 ],
@@ -80,7 +92,9 @@ export default {
                         trigger: 'blur'
                     }
                 ]
-            }
+            },
+            goodsList: [],
+            goods: {}
         };
     },
     methods: {
@@ -95,6 +109,7 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
+            data.name = this.goods.name;
 
             this.saving = true;
             this.$http
@@ -125,6 +140,11 @@ export default {
                         this.$message.error(e.error);
                     }
                 });
+        },
+        optionChange(id) {
+            this.goods = this.goodsList.find(item => {
+                return item.id === id;
+            });
         }
     }
 };

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

@@ -25,7 +25,7 @@
         >
             <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="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>
@@ -35,7 +35,7 @@
             <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' } })"
+                        @click="$router.push({ path: '/GoodsInfoList', query: { column: row.goodsInfoId + ',name' } })"
                         type="primary"
                         size="small"
                         plain

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

@@ -1,198 +0,0 @@
-<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/SetMealEdit.vue

@@ -0,0 +1,53 @@
+<template>
+    <div class="edit-view">
+        <el-tabs type="border-card" class="my-tabs" v-model="active">
+            <el-tab-pane label="套餐信息" name="first">
+                <SetInfoEdit @next="goNext" />
+            </el-tab-pane>
+            <el-tab-pane label="套餐内容" :disabled="!id" name="second">
+                <SetGoodsTable ref="setGoodsList" />
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+<script>
+import SetInfoEdit from '../components/SetInfoEdit';
+import SetGoodsTable from '../components/SetGoodsTable';
+
+export default {
+    name: 'SetMealMain',
+    created() {
+        if (this.$route.query.id) {
+            this.id = this.$route.query.id;
+        }
+    },
+    data() {
+        return {
+            active: 'first',
+            id: 0
+        };
+    },
+    methods: {
+        goNext(page) {
+            this.active = page;
+        }
+    },
+    components: {
+        SetGoodsTable,
+        SetInfoEdit
+    },
+    watch: {
+        id() {
+            if (this.id) {
+                this.$refs.setGoodsList.getList(this.id);
+            }
+        },
+        $route() {
+            if (this.$route.query.id) {
+                this.id = this.$route.query.id;
+            }
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/SetInfoList.vue → src/main/vue/src/views/SetMealList.vue

@@ -76,13 +76,13 @@ import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-    name: 'SetInfoList',
+    name: 'SetMealList',
     mixins: [pageableTable],
     data() {
         return {
             multipleMode: false,
             search: '',
-            url: '/setInfo/all',
+            url: '/setMeal/all',
             downloading: false,
             typeOptions: [
                 { label: '团队', value: 'TEAM' },
@@ -114,7 +114,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/setInfoEdit',
+                path: '/setMealEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -122,7 +122,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/setInfoEdit',
+                path: '/setMealEdit',
                 query: {
                     id: row.id
                 }
@@ -131,7 +131,7 @@ export default {
         download() {
             this.downloading = true;
             this.$axios
-                .get('/setInfo/excel', {
+                .get('/setMeal/excel', {
                     responseType: 'blob',
                     params: { size: 10000 }
                 })
@@ -164,7 +164,7 @@ export default {
         deleteRow(row) {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/setInfo/del/${row.id}`);
+                    return this.$http.post(`/setMeal/del/${row.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/UserSetEdit.vue

@@ -0,0 +1,101 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="102px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="userId" label="userId">
+                <el-input-number type="number" v-model="formData.userId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="goodsInfoId" label="goodsInfoId">
+                <el-input-number type="number" v-model="formData.goodsInfoId"></el-input-number>
+            </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="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: 'UserSetEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('userSet/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: {}
+        };
+    },
+    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('/userSet/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(`/userSet/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/UserSetFlowEdit.vue

@@ -0,0 +1,105 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="65px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="userId" label="userId">
+                <el-input-number type="number" v-model="formData.userId"></el-input-number>
+            </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 prop="content" label="内容">
+                <el-input v-model="formData.content"></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: 'UserSetFlowEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('userSetFlow/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: {},
+            typeOptions: [
+                { label: '购买', value: 'BUY' },
+                { label: '核销', value: 'WRITE_OFF' }
+            ]
+        };
+    },
+    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('/userSetFlow/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(`/userSetFlow/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/UserSetFlowList.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="userId" label="userId"> </el-table-column>
+            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="content" 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: 'UserSetFlowList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/userSetFlow/all',
+            downloading: false,
+            typeOptions: [
+                { label: '购买', value: 'BUY' },
+                { label: '核销', value: 'WRITE_OFF' }
+            ]
+        };
+    },
+    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: '/userSetFlowEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/userSetFlowEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/userSetFlow/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(`/userSetFlow/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/UserSetList.vue

@@ -0,0 +1,159 @@
+<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="userId"> </el-table-column>
+            <el-table-column prop="goodsInfoId" label="goodsInfoId"> </el-table-column>
+            <el-table-column prop="num" 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: 'UserSetList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/userSet/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: '/userSetEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/userSetEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/userSet/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(`/userSet/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/service/OrderInfoServiceTest.java

@@ -0,0 +1,26 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.enums.PayMethod;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class OrderInfoServiceTest {
+
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @Test
+    public void order() {
+        System.out.println(orderInfoService.order(2L, 17L, PayMethod.WEIXIN));
+    }
+
+    @Test
+    public void completed() {
+        orderInfoService.completed(22L, "xxx");
+    }
+}