订单部分

src/main/java/com/winhc/repal/controller/RepalOrderController.java

@@ -0,0 +1,39 @@
+package com.winhc.repal.controller;
+
+import com.winhc.common.base.BeanResponse;
+import com.winhc.common.enums.CodeMsg;
+import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.model.dto.RepalOrderPageDTO;
+import com.winhc.repal.model.vo.RepalOrderVO;
+import com.winhc.repal.service.RepalOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: RepalOrderController
+ * @Author: xda
+ * @Date: 2022/5/19 14:37
+ */
+@Api(tags = "回款宝订单")
+@RestController
+@RequestMapping(value = "/order")
+public class RepalOrderController {
+
+    @Autowired
+    private RepalOrderService repalOrderService;
+
+    @ApiOperation("回款宝订单列表")
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public BeanResponse<VOPage<RepalOrderVO>> getRepalOrderPage(RepalOrderPageDTO dto) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalOrderService.getRepalOrderPage(dto));
+    }
+
+
+
+
+
+}

src/main/java/com/winhc/repal/model/dto/RepalOrderPageDTO.java

@@ -0,0 +1,18 @@
+package com.winhc.repal.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: RepalOrderPageDTO
+ * @Author: xda
+ * @Date: 2022/5/19 20:12
+ */
+@Data
+@ApiModel("查询回款宝订单")
+public class RepalOrderPageDTO {
+
+    @ApiModelProperty("订单完成(0), 支付成功/进行中(2),已关闭(C)")
+    private String orderStatus;
+}

src/main/java/com/winhc/repal/model/vo/RepalBillDetailVO.java

@@ -1,6 +1,5 @@
 package com.winhc.repal.model.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +7,7 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -109,20 +109,28 @@ public class RepalBillDetailVO {
     @Getter
     @Setter
     @ToString
+    @ApiModel("金额变动记录")
     public static class BillMoneyChange {
 
-        @ApiModelProperty("金额变动文案")
-        private String changeDesc;
+        @ApiModelProperty("金额string")
+        private String changeAmt;
 
         @ApiModelProperty("操作时间,string, yyyy-MM-dd HH:mm:ss")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime changeTime;
 
+        @ApiModelProperty("操作人name")
+        private String name;
+
+
+
     }
 
     @Getter
     @Setter
     @ToString
+    @ApiModel("合同")
     public static class BillContract {
 
         @ApiModelProperty("文件url")

src/main/java/com/winhc/repal/model/vo/RepalOrderVO.java

@@ -0,0 +1,52 @@
+package com.winhc.repal.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Description: RepalOrderVO
+ * @Author: xda
+ * @Date: 2022/5/19 20:00
+ */
+@Data
+@ApiModel("回款宝订单")
+public class RepalOrderVO {
+
+    @ApiModelProperty("订单类型 1短信 2律师函 3咨询 4诉讼 5其他")
+    private Integer orderType;
+
+    @ApiModelProperty("订单状态。订单完成(0),支付成功/进行中(2),已关闭(C)")
+    private String orderStatus;
+
+    @ApiModelProperty("描述")
+    private String desc;
+
+    @ApiModelProperty("标的")
+    private String caseAmtStr;
+
+    @ApiModelProperty("欠款对象/客户name")
+    private String custName;
+
+    @ApiModelProperty("联系人")
+    private String linkman;
+
+    @ApiModelProperty("订单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime orderTime;
+
+    @ApiModelProperty("法律服务大类")
+    private Integer lawyerServiceType;
+
+    @ApiModelProperty("法律服务子类")
+    private Integer lawyerServiceSubType;
+
+    @ApiModelProperty("法律服务类型")
+    private Integer serviceType;
+
+}

src/main/java/com/winhc/repal/service/RepalOrderService.java

@@ -0,0 +1,23 @@
+package com.winhc.repal.service;
+
+import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.model.dto.RepalOrderPageDTO;
+import com.winhc.repal.model.vo.RepalOrderVO;
+
+/**
+ * @Description: RepalOrderService
+ * @Author: xda
+ * @Date: 2022/5/19 19:48
+ */
+public interface RepalOrderService {
+
+
+    /**
+     * 获取回款宝订单
+     * @param dto dto
+     * @return com.winhc.common.model.base.VOPage<com.winhc.repal.model.vo.RepalOrderVO>
+     * @author xda
+     * @date 2022/5/19 20:14
+     */
+    VOPage<RepalOrderVO> getRepalOrderPage(RepalOrderPageDTO dto);
+}

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -396,9 +396,12 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
             vo.setChangeList(repalChangeRecordList.stream().map(t -> {
                 RepalBillDetailVO.BillMoneyChange billMoneyChange = new RepalBillDetailVO.BillMoneyChange();
                 billMoneyChange.setChangeTime(t.getTimeCreated());
-                billMoneyChange.setChangeDesc(t.getOperUserName() + " 增加回款 " + t.getTransMoney().stripTrailingZeros().toPlainString());
+                billMoneyChange.setName(t.getOperUserName());
+                billMoneyChange.setChangeAmt(t.getTransMoney().setScale(2).toString());
                 return billMoneyChange;
             }).collect(Collectors.toList()));
+        } else {
+            vo.setChangeList(new ArrayList<>());
         }
         return vo;
     }

src/main/java/com/winhc/repal/service/impl/RepalCustomerServiceImpl.java

@@ -471,7 +471,8 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
                 result.setChangeList(repalChangeRecordList.stream().map(t -> {
                     RepalBillDetailVO.BillMoneyChange billMoneyChange = new RepalBillDetailVO.BillMoneyChange();
                     billMoneyChange.setChangeTime(t.getTimeCreated());
-                    billMoneyChange.setChangeDesc(t.getOperUserName() + " 增加回款 " + t.getTransMoney().stripTrailingZeros().toPlainString());
+                    billMoneyChange.setName(t.getOperUserName());
+                    billMoneyChange.setChangeAmt(t.getTransMoney().setScale(2).toString());
                     return billMoneyChange;
                 }).collect(Collectors.toList()));
             }

src/main/java/com/winhc/repal/service/impl/RepalOrderServiceImpl.java

@@ -0,0 +1,26 @@
+package com.winhc.repal.service.impl;
+
+import com.winhc.common.model.base.VOPage;
+import com.winhc.repal.model.dto.RepalOrderPageDTO;
+import com.winhc.repal.model.vo.RepalOrderVO;
+import com.winhc.repal.service.RepalDynamicService;
+import com.winhc.repal.service.RepalOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: RepalOrderServiceImpl
+ * @Author: xda
+ * @Date: 2022/5/19 19:48
+ */
+@Service
+public class RepalOrderServiceImpl implements RepalOrderService {
+
+    @Autowired
+    private RepalDynamicService repalDynamicService;
+
+    @Override
+    public VOPage<RepalOrderVO> getRepalOrderPage(RepalOrderPageDTO dto) {
+        return null;
+    }
+}