核销

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

@@ -6,11 +6,16 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
+import javax.persistence.*;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Entity
 @ApiModel(value = "核销记录")
 public class WriteOffRecord extends BaseEntity {
 
@@ -20,6 +25,24 @@ public class WriteOffRecord extends BaseEntity {
     @ApiModelProperty(value = "核销人")
     private Long writeOffUserId;
 
+    /*
+    存储内容
+    [{"goodsInfoId":11,"num":1},{"goodsInfoId":12,"num":1},{"goodsInfoId":13,"num":4}]
+     */
+    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "核销内容")
     private String content;
+
+//    @Enumerated(EnumType.STRING)
+//    private SetType type;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "writeOffUserId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
+    private User writeOffUser;
 }

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

@@ -0,0 +1,15 @@
+package com.izouma.jiashanxia.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class GoodsVO {
+    private String name;
+    private Long   num;
+}

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

@@ -0,0 +1,24 @@
+package com.izouma.jiashanxia.dto;
+
+import com.izouma.jiashanxia.enums.FlowType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class UserSetFlowVO {
+    private Long userId;
+
+    private FlowType type;
+
+    private List<GoodsVO> content;
+
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,32 @@
+package com.izouma.jiashanxia.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "核销记录")
+public class WriteOffRecordDTO {
+
+    private Long id;
+
+    @ApiModelProperty(value = "被核销人")
+    private String nickname;
+
+    @ApiModelProperty(value = "核销人")
+    private String writeOffNickname;
+
+    private LocalDateTime createdAt;
+
+    private List<GoodsVO> goods;
+
+}

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

@@ -3,6 +3,7 @@ package com.izouma.jiashanxia.enums;
 public enum AuthorityName {
     ROLE_USER("普通用户"),
     ROLE_DEV("开发者"),
+    ROLE_WRITER("核销者"),
     ROLE_ADMIN("管理员");
     private final String description;
 

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

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.WriteOffRecord;
+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 WriteOffRecordRepo extends JpaRepository<WriteOffRecord, Long>, JpaSpecificationExecutor<WriteOffRecord> {
+    @Query("update WriteOffRecord t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -0,0 +1,77 @@
+package com.izouma.jiashanxia.service;
+
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.izouma.jiashanxia.domain.OrderInfo;
+import com.izouma.jiashanxia.domain.User;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.OrderInfoRepo;
+import com.izouma.jiashanxia.repo.UserRepo;
+import com.izouma.jiashanxia.utils.JsonUtils;
+import com.izouma.jiashanxia.utils.SnowflakeIdWorker;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+@Service
+@Slf4j
+public class ConsumptionService {
+    @Autowired
+    private UserRepo      userRepo;
+    @Autowired
+    private OrderInfoRepo orderInfoRepo;
+    @Value("${wx.pay.notifyUrl}")
+    private String        wxNotifyUrl;
+    @Autowired
+    private Environment   environment;
+    @Autowired
+    private WxPayService  wxPayService;
+
+
+    /*
+    微信支付
+     */
+    public WxPayMpOrderResult payOrder(Long userId, Long orderId) {
+        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
+        OrderInfo orders = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("订单错误"));
+
+        String body = orders.getName();
+        WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
+        request.setBody(body);
+        //订单号
+        request.setOutTradeNo(String.valueOf(new SnowflakeIdWorker(1, 1).nextId()));
+        //分为单位
+        request.setTotalFee(orders.getPrice().multiply(BigDecimal.valueOf(100)).intValue());
+        if (Arrays.stream(environment.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
+            request.setTotalFee(1);
+        }
+        request.setOpenid(user.getOpenId());
+        request.setNotifyUrl(wxNotifyUrl);
+        request.setSpbillCreateIp("180.102.110.170");
+        request.setTradeType(WxPayConstants.TradeType.JSAPI);
+        request.setSignType("MD5");
+        request.setAttach(new JsonUtils.Builder()
+                .add("type", "member")
+                .add("orderId", orderId)
+                .add("userId", userId)
+                .add("amount", orders.getPrice())
+                .build());
+
+        try {
+            return wxPayService.createOrder(request);
+        } catch (WxPayException e) {
+            log.info("微信支付异常", e);
+            throw new BusinessException(e.getMessage());
+        }
+    }
+
+
+}

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

@@ -83,6 +83,20 @@ public class OrderInfoService {
         }
     }
 
+    /*
+    取消订单
+     */
+    public OrderInfo cancelOrder(Long orderId) {
+        OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
+        if (OrderInfoStatus.PAID.equals(orderInfo.getStatus())) {
+            throw new BusinessException("订单已支付，无法取消");
+        } else if (OrderInfoStatus.CANCELLED.equals(orderInfo.getStatus())) {
+            return orderInfo;
+        }
+        orderInfo.setStatus(OrderInfoStatus.CANCELLED);
+        return orderInfoRepo.save(orderInfo);
+    }
+
     /*
     分销
     又有团队，员工自己又购买了套餐，企业是否有收益？

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

@@ -1,26 +1,70 @@
 package com.izouma.jiashanxia.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.jiashanxia.domain.GoodsInfo;
 import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.dto.GoodsDTO;
+import com.izouma.jiashanxia.dto.GoodsVO;
 import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.dto.UserSetFlowVO;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.GoodsInfoRepo;
 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;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 public class UserSetFlowService {
 
     private UserSetFlowRepo userSetFlowRepo;
+    private GoodsInfoRepo   goodsInfoRepo;
 
     public Page<UserSetFlow> all(PageQuery pageQuery) {
         return userSetFlowRepo.findAll(JpaUtils.toSpecification(pageQuery, UserSetFlow.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-    public List<UserSetFlow> my(Long userId) {
-        return userSetFlowRepo.findAllByUserId(userId);
+
+    public List<UserSetFlowVO> my(Long userId) {
+        List<UserSetFlowVO> vos = new ArrayList<>();
+        // 查找用户相关
+        List<UserSetFlow> flows = userSetFlowRepo.findAllByUserId(userId);
+//        Set<Long> goodsId = new HashSet<>();
+//        // 找出相关商品
+//        flows.forEach(flow -> {
+//            List<GoodsDTO> goodsDTOS = JSONObject.parseArray(flow.getContent(), GoodsDTO.class);
+//            goodsId.addAll(goodsDTOS.stream().map(GoodsDTO::getGoodsInfoId).collect(Collectors.toSet()));
+//        });
+        Map<Long, String> goodsMap = goodsInfoRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(GoodsInfo::getId, GoodsInfo::getName));
+        // 转vo
+        flows.forEach(flow -> {
+            List<GoodsVO> goodsVOS = this.toGoodsVO(flow.getContent(),goodsMap);
+            UserSetFlowVO vo = new UserSetFlowVO();
+            BeanUtil.copyProperties(flow, vo);
+            vo.setContent(goodsVOS);
+            vos.add(vo);
+        });
+        return vos;
+
+    }
+
+    public List<GoodsVO> toGoodsVO(String content, Map<Long, String> goodsMap) {
+        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(content, GoodsDTO.class);
+        List<GoodsVO> goodsVOS = new ArrayList<>();
+        goodsDTOS.forEach(goodsDTO ->
+                goodsVOS.add(GoodsVO.builder()
+                        .name(goodsMap.get(goodsDTO.getGoodsInfoId()))
+                        .num(goodsDTO.getNum())
+                        .build())
+        );
+        return goodsVOS;
     }
 }

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

@@ -35,6 +35,8 @@ public class UserSetService {
 
     /*
     加入套餐
+
+    用户套餐和企业套餐重叠怎么办？
     */
     public void joinUserSet(Long userId, List<SetGoods> setGoodsList) {
         // 用户已有套餐

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

@@ -36,7 +36,7 @@ public class WithdrawService {
      */
     public Withdraw apply(Long userId, BigDecimal amount, String realName, String account) {
         if (BigDecimal.ZERO.compareTo(amount) >= 0) {
-            throw new BusinessException("提现金额小于零");
+            throw new BusinessException("提现金额小于等于零");
         }
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
         if (amount.compareTo(user.getAmount()) > 0) {
@@ -56,6 +56,7 @@ public class WithdrawService {
                         .amount(amount)
                         .balance(subtract)
                         .status(WithdrawStatus.PENDING)
+                        .payMethod(PayMethod.WEIXIN)
                         .build());
 
     }

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

@@ -0,0 +1,107 @@
+package com.izouma.jiashanxia.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.jiashanxia.domain.*;
+import com.izouma.jiashanxia.dto.GoodsDTO;
+import com.izouma.jiashanxia.dto.GoodsVO;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.dto.WriteOffRecordDTO;
+import com.izouma.jiashanxia.enums.FlowType;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.GoodsInfoRepo;
+import com.izouma.jiashanxia.repo.UserSetFlowRepo;
+import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.repo.WriteOffRecordRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class WriteOffRecordService {
+
+    private WriteOffRecordRepo writeOffRecordRepo;
+    private UserSetFlowRepo    userSetFlowRepo;
+    private UserSetRepo        userSetRepo;
+    private GoodsInfoRepo      goodsInfoRepo;
+    private UserSetFlowService userSetFlowService;
+
+    public Page<WriteOffRecord> all(PageQuery pageQuery) {
+//        return writeOffRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, WriteOffRecord.class), JpaUtils.toPageRequest(pageQuery));
+        return writeOffRecordRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, WriteOffRecord.class, root, criteriaQuery, criteriaBuilder);
+            if (StrUtil.isNotEmpty(pageQuery.getSearch())) {
+                List<Predicate> or = new ArrayList<>();
+                or.add(criteriaBuilder.like(root.get("user").get("nickname"), "%" + pageQuery.getSearch() + "%"));
+                or.add(criteriaBuilder.like(root.get("writeOffUser")
+                        .get("nickname"), "%" + pageQuery.getSearch() + "%"));
+                and.add(criteriaBuilder.or(or.toArray(new Predicate[0])));
+            }
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        }), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /*
+    核销
+     */
+    public WriteOffRecord save(WriteOffRecord writeOffRecord) {
+        if (writeOffRecord.getUserId().equals(writeOffRecord.getWriteOffUserId())) {
+            throw new BusinessException("不可自己核销自己");
+        }
+
+        // 用户已有套餐
+        Map<Long, UserSet> userSetMap = userSetRepo.findAllByUserId(writeOffRecord.getUserId())
+                .stream()
+                .collect(Collectors.toMap(UserSet::getGoodsInfoId, userSet -> userSet));
+
+        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffRecord.getContent(), GoodsDTO.class);
+        goodsDTOS.forEach(goodsDTO -> {
+            UserSet userSet = userSetMap.get(goodsDTO.getGoodsInfoId());
+            if (ObjectUtil.isEmpty(userSet)) {
+                throw new BusinessException("无此项目");
+            }
+            if (goodsDTO.getNum() > userSet.getNum()) {
+                throw new BusinessException("核销数量大于套餐数量");
+            }
+        });
+
+        // 保存套餐流水
+        userSetFlowRepo.save(
+                UserSetFlow.builder()
+                        .userId(writeOffRecord.getUserId())
+                        .content(writeOffRecord.getContent())
+                        .type(FlowType.WRITE_OFF)
+                        .build());
+
+        return writeOffRecordRepo.save(writeOffRecord);
+    }
+
+    public WriteOffRecordDTO getDTO(Long id) {
+        WriteOffRecord writeOffRecord = writeOffRecordRepo.findById(id).orElseThrow(new BusinessException("无核销记录"));
+        // 转vo
+        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffRecord.getContent(), GoodsDTO.class);
+        Set<Long> ids = goodsDTOS.stream().map(GoodsDTO::getGoodsInfoId).collect(Collectors.toSet());
+        Map<Long, String> goodsMap = goodsInfoRepo.findAllById(ids)
+                .stream()
+                .collect(Collectors.toMap(GoodsInfo::getId, GoodsInfo::getName));
+        List<GoodsVO> goodsVOS = userSetFlowService.toGoodsVO(writeOffRecord.getContent(), goodsMap);
+
+        return WriteOffRecordDTO.builder()
+                .id(writeOffRecord.getId())
+                .createdAt(writeOffRecord.getCreatedAt())
+                .nickname(writeOffRecord.getUser().getNickname())
+                .writeOffNickname(writeOffRecord.getWriteOffUser().getNickname())
+                .goods(goodsVOS)
+                .build();
+    }
+}

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

@@ -66,5 +66,11 @@ public class OrderInfoController extends BaseController {
     public OrderInfo creat(@RequestParam Long setMealId, @RequestParam PayMethod payMethod) {
         return orderInfoService.creatOrder(SecurityUtils.getAuthenticatedUser().getId(), setMealId, payMethod);
     }
+
+    @PostMapping("/cancel")
+    @ApiOperation("取消订单")
+    public OrderInfo cancel(Long orderId) {
+        return orderInfoService.cancelOrder(orderId);
+    }
 }
 

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

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

src/main/resources/genjson/WriteOffRecord.json

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

src/main/vue/src/router.js

@@ -240,6 +240,24 @@ const router = new Router({
                     meta: {
                         title: '团队信息'
                     }
+                },
+                {
+                    path: '/writeOffRecordEdit',
+                    name: 'WriteOffRecordEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "writeOffRecordEdit" */ '@/views/WriteOffRecordEdit.vue'),
+                    meta: {
+                        title: '核销记录编辑'
+                    }
+                },
+                {
+                    path: '/writeOffRecordList',
+                    name: 'WriteOffRecordList',
+                    component: () =>
+                        import(/* webpackChunkName: "writeOffRecordList" */ '@/views/WriteOffRecordList.vue'),
+                    meta: {
+                        title: '核销记录'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/UserList.vue

@@ -25,9 +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="username" label="用户名" min-width="300"> </el-table-column>
-            <el-table-column prop="nickname" label="昵称" min-width="300"> </el-table-column>
-            <el-table-column label="头像" min-width="300">
+            <el-table-column prop="username" label="用户名" min-width="100"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称" min-width="100"> </el-table-column>
+            <el-table-column label="头像" min-width="100">
                 <template slot-scope="{ row }">
                     <el-image
                         style="width: 30px; height: 30px;"
@@ -37,6 +37,7 @@
                     ></el-image>
                 </template>
             </el-table-column>
+            <el-table-column prop="amount" label="余额"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>

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

@@ -32,31 +32,30 @@
             <el-table-column prop="status" label="提现状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column prop="account" label="账号"> </el-table-column>
             <el-table-column prop="realName" label="真实姓名"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" min-width="200">
                 <template slot-scope="{ row }">
-                    <template slot-scope="{ row }">
-                        <el-button
-                            v-if="row.status === 'PENDING'"
-                            :loading="row.loading"
-                            @click="audit(row, true)"
-                            type="primary"
-                            size="mini"
-                            plain
-                        >
-                            通过
-                        </el-button>
-                        <el-button
-                            v-if="row.status === 'PENDING'"
-                            @click="audit(row, false)"
-                            type="danger"
-                            size="mini"
-                            plain
-                        >
-                            拒绝
-                        </el-button>
-                    </template>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <el-button
+                        v-if="row.status === 'PENDING'"
+                        :loading="row.loading"
+                        @click="audit(row, true)"
+                        type="success"
+                        size="mini"
+                        plain
+                    >
+                        通过
+                    </el-button>
+                    <el-button
+                        v-if="row.status === 'PENDING'"
+                        :loading="row.loading"
+                        @click="audit(row, false)"
+                        type="warning"
+                        size="mini"
+                        plain
+                    >
+                        拒绝
+                    </el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain v-else>删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -98,7 +97,8 @@ export default {
             downloading: false,
             payMethodOptions: [
                 { label: '微信', value: 'WEIXIN' },
-                { label: '余额', value: 'YUE' }
+                { label: '余额', value: 'YUE' },
+                { label: '支付宝', value: 'ALI' }
             ],
             statusOptions: [
                 { label: '提现成功', value: 'SUCCESS' },
@@ -203,7 +203,7 @@ export default {
         audit(row, pass) {
             this.$set(row, 'loading', true);
             this.$http
-                .get('/withdraw/audit', {
+                .post('/withdraw/audit', {
                     id: row.id,
                     pass: pass
                 })

src/main/vue/src/views/WriteOffRecordEdit.vue

@@ -0,0 +1,128 @@
+<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="被核销人">
+                <el-input v-model="formData.nickname"></el-input>
+            </el-form-item>
+            <el-form-item prop="writeOffUserId" label="核销人">
+                <el-input v-model="formData.writeOffNickname"></el-input>
+            </el-form-item>
+            <el-form-item prop="content" label="核销内容">
+                <!--<el-input v-model="formData.content"></el-input>-->
+                <div v-for="item in formData.goods" :key="item.name">
+                    <el-col :span="16">
+                        <el-input v-model="item.name"></el-input>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-input v-model="item.num"></el-input>
+                    </el-col>
+                </div>
+            </el-form-item>
+            <el-form-item prop="createdAt" label="核销时间">
+                <el-date-picker
+                    v-model="formData.createdAt"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期时间"
+                >
+                </el-date-picker>
+            </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: 'WriteOffRecordEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('writeOffRecord/getDTO/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                goods: {}
+            },
+            rules: {},
+            typeOptions: [
+                { label: 'TEAM', value: 'TEAM' },
+                { label: 'PERSONAL', value: 'PERSONAL' }
+            ],
+            goods: []
+        };
+    },
+    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('/writeOffRecord/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(`/writeOffRecord/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/WriteOffRecordList.vue

@@ -0,0 +1,170 @@
+<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="user.nickname" label="被核销人"> </el-table-column>
+            <el-table-column prop="writeOffUser.nickname" label="核销人"> </el-table-column>
+            <el-table-column prop="createdAt" label="核销时间"> </el-table-column>
+            <!--<el-table-column prop="type" label="类别" :formatter="typeFormatter"> </el-table-column>-->
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'WriteOffRecordList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/writeOffRecord/all',
+            downloading: false,
+            typeOptions: [
+                { label: 'TEAM', value: 'TEAM' },
+                { label: 'PERSONAL', value: 'PERSONAL' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/writeOffRecordEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/writeOffRecordEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/writeOffRecord/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(`/writeOffRecord/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

@@ -23,4 +23,9 @@ public class OrderInfoServiceTest {
     public void completed() {
         orderInfoService.completed(47L, "11000001");
     }
+
+    @Test
+    public void cancel() {
+        System.out.println(orderInfoService.cancelOrder(58L));
+    }
 }

src/test/java/com/izouma/jiashanxia/service/UserSetFlowServiceTest.java

@@ -0,0 +1,27 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.dto.UserSetFlowVO;
+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;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class UserSetFlowServiceTest {
+
+    @Autowired
+    private UserSetFlowService userSetFlowService;
+
+    @Test
+    public void my() {
+        // 810ms 3012ms
+        List<UserSetFlowVO> my = userSetFlowService.my(2L);
+        my.forEach(System.out::println);
+    }
+}

src/test/java/com/izouma/jiashanxia/service/WithdrawServiceTest.java

@@ -0,0 +1,22 @@
+package com.izouma.jiashanxia.service;
+
+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;
+
+import java.math.BigDecimal;
+
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class WithdrawServiceTest {
+    @Autowired
+    private WithdrawService withdrawService;
+
+    @Test
+    public void apply() {
+        System.out.println(withdrawService.apply(40L, new BigDecimal("100"), "xxx", "xxx"));
+    }
+}

src/test/java/com/izouma/jiashanxia/service/WriteOffRecordServiceTest.java

@@ -0,0 +1,43 @@
+package com.izouma.jiashanxia.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.izouma.jiashanxia.domain.WriteOffRecord;
+import com.izouma.jiashanxia.dto.GoodsDTO;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class WriteOffRecordServiceTest {
+
+    @Autowired
+    private WriteOffRecordService writeOffRecordService;
+
+    @Test
+    public void writeOff() {
+        List<GoodsDTO> dtos = new ArrayList<>();
+        GoodsDTO dto1 = GoodsDTO.builder()
+                .goodsInfoId(11L)
+                .num(1L)
+                .build();
+        GoodsDTO dto2 = GoodsDTO.builder()
+                .goodsInfoId(12L)
+                .num(1L)
+                .build();
+        dtos.add(dto1);
+        dtos.add(dto2);
+
+        WriteOffRecord build = WriteOffRecord.builder()
+                .userId(46L)
+                .writeOffUserId(1L)
+                .content(JSONObject.toJSONString(dtos))
+                .build();
+        writeOffRecordService.save(build);
+    }
+}