退款

pro-base/src/main/java/com/idea/paymentManagement/controller/RefundDetailController.java

@@ -3,6 +3,7 @@ package com.idea.paymentManagement.controller;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.paymentManagement.model.RefundDetail;
+import com.idea.paymentManagement.model.RefundDetailDto;
 import com.idea.paymentManagement.service.RefundDetailService;
 import com.rockstar.common.base.BaseController;
 import com.rockstar.frame.model.extend.DateTrans;
@@ -31,9 +32,9 @@ public class RefundDetailController extends BaseController {
      */
     @PostMapping(value = "getByCustomerManagementId",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public List<RefundDetail> getByCustomerManagementId(String customerManagementId){
+    public List<RefundDetailDto> getByCustomerManagementId(String customerManagementId, String houseId){
 
-        List<RefundDetail> result = modelService.getByCustomerManagementId(customerManagementId);
+        List<RefundDetailDto> result = modelService.getByCustomerManagementId(customerManagementId,houseId);
         return result;
     }
 

pro-base/src/main/java/com/idea/paymentManagement/controller/RefundManageController.java

@@ -46,7 +46,7 @@ public class RefundManageController extends BaseController {
     }
 
     /**
-     * 新增收款
+     * 新增退款
      * @param model
      * @return
      */
@@ -59,7 +59,7 @@ public class RefundManageController extends BaseController {
 
 
     /**
-     * 新增收款
+     * 编辑退款
      * @param model
      * @return
      */

pro-base/src/main/java/com/idea/paymentManagement/model/RefundDetailDto.java

@@ -0,0 +1,14 @@
+package com.idea.paymentManagement.model;
+
+import lombok.Data;
+
+@Data
+public class RefundDetailDto extends RefundDetail{
+
+    private String uuid;
+
+
+
+
+
+}

pro-base/src/main/java/com/idea/paymentManagement/service/MaintenanceFundsManagementService.java

@@ -111,11 +111,30 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         contractManage.setFundCollectionStatus(2);
         contractManageMapper.updateByPrimaryKeySelective(contractManage);
 
+        // 新增一条定金收款记录
+        PayLog payLog = new PayLog();
+        payLog.setId(IdUtil.simpleUUID());
+        payLog.setHouseId(contractManage.getHouseId());
+        payLog.setContractId(model.getContractId());
+        payLog.setCustomerManagementId(contractManage.getCustomerManagementId());
+        // 收款类型 专项维修资金
+        payLog.setPayType(2);
+        // 款项内容 专项维修资金
+        payLog.setContentType(4);
+        payLog.setPayMoney(model.getPayMoney());
+        payLog.setPayTime(new Date());
+        payLog.setPaymentMethod(model.getPaymentMethod());
+        payLog.setStatus(0);
+        payLogMapper.insertSelective(payLog);
+
         model.setHouseId(contractManage.getHouseId());
         model.setCustomerManagementId(contractManage.getCustomerManagementId());
         model.setCreatedId(ShiroUtils.getUserId());
         model.setCreatedAt(new Date());
         int result = insertSelective(model);
+
+
+
         return result;
     }
 

pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -2,6 +2,7 @@ package com.idea.paymentManagement.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.model.ParkInfo;
@@ -156,6 +157,9 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         if (StringUtils.isNotEmpty(model.getContractId())) {
             criteria.andContractIdEqualTo(model.getContractId());
         }
+        if (ObjectUtil.isNotNull(model.getPayType())) {
+            criteria.andPayTypeEqualTo(model.getPayType());
+        }
         return ex;
     }
 
@@ -173,7 +177,7 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         payLogDto.setBuyerName(contractManage.getBuyerName());
         payLogDto.setHouseName(contractManage.getHouseName());
         payLogDto.setPaymentMethod(contractManage.getPaymentMethod());
-        payLogDto.setDeadLine(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, contractManage.getDeadline()));
+//        payLogDto.setDeadLine(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, contractManage.getDeadline()));
         payLogDto.setReceivableMoney(contractManage.getTotalPrice());
         // 查询已收房款
         String receivedMoneyStr = extendMapper.getMoneyByContractId(contractId, 1);

pro-base/src/main/java/com/idea/paymentManagement/service/RefundDetailService.java

@@ -1,18 +1,21 @@
 package com.idea.paymentManagement.service;
 
 import cn.hutool.core.util.IdUtil;
+import com.idea.customerManagement.mapper.ContractManageMapper;
+import com.idea.customerManagement.model.ContractManage;
+import com.idea.customerManagement.model.ContractManageExample;
+import com.idea.customerManagement.model.CustomerManagementExample;
+import com.idea.paymentManagement.mapper.PayLogExtendMapper;
 import com.idea.paymentManagement.mapper.PayLogMapper;
 import com.idea.paymentManagement.mapper.RefundDetailMapper;
-import com.idea.paymentManagement.model.PayLog;
-import com.idea.paymentManagement.model.PayLogExample;
-import com.idea.paymentManagement.model.RefundDetail;
-import com.idea.paymentManagement.model.RefundDetailExample;
+import com.idea.paymentManagement.model.*;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,7 +26,10 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
     private RefundDetailMapper modelMapper;
     @Autowired
     private PayLogMapper payLogMapper;
-
+    @Autowired
+    private PayLogExtendMapper payLogExtendMapper;
+    @Autowired
+    private ContractManageMapper contractManageMapper;
 
 
     @Override
@@ -53,12 +59,12 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
 
     @Override
     public int updateByExampleSelective(RefundDetail refundDetail, RefundDetailExample refundDetailExample) {
-        return modelMapper.updateByExampleSelective(refundDetail,refundDetailExample);
+        return modelMapper.updateByExampleSelective(refundDetail, refundDetailExample);
     }
 
     @Override
     public int updateByExample(RefundDetail refundDetail, RefundDetailExample refundDetailExample) {
-        return modelMapper.updateByExample(refundDetail,refundDetailExample);
+        return modelMapper.updateByExample(refundDetail, refundDetailExample);
     }
 
     @Override
@@ -79,30 +85,50 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
 
     /**
      * 根据轮号客户id 查询已收 部分收款 完全收款
+     *
      * @param customerManagementId
      * @return
      */
-    public List<RefundDetail> getByCustomerManagementId(String customerManagementId){
-
-        PayLogExample payLogExample = new PayLogExample();
-        payLogExample.createCriteria().andCustomerManagementIdEqualTo(customerManagementId);
-        List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
-        List<RefundDetail> refundDetails = new ArrayList<>();
-        for(PayLog payLog : payLogs){
-            RefundDetail refundDetail = new RefundDetail();
-            refundDetail.setType(payLog.getContentType().toString());
-            refundDetail.setReceivedAmount(payLog.getPayMoney());
-            refundDetails.add(refundDetail);
+    public List<RefundDetailDto> getByCustomerManagementId(String customerManagementId, String houseId) {
+
+        List<RefundDetailDto> refundDetails = new ArrayList<>();
+        ContractManageExample example = new ContractManageExample();
+        example.createCriteria().andCustomerManagementIdEqualTo(customerManagementId).andHouseIdEqualTo(houseId);
+        List<ContractManage> contractManages = contractManageMapper.selectByExample(example);
+        ContractManage contractManage = contractManages.get(0);
+        String type = "";
+        // 合同已签约 房款 未签约 定金
+        if (contractManage.getContractStatus() == 1) {
+            type = "定金";
         }
+        if (contractManage.getContractStatus() == 2) {
+            type = "房款";
+        }
+        // 房款
+        String money = payLogExtendMapper.getMoneyByContractId(contractManage.getId(), 1);
+        RefundDetailDto refundDetail = new RefundDetailDto();
+        refundDetail.setType(type);
+        refundDetail.setReceivedAmount(new BigDecimal(money));
+        refundDetail.setUuid(IdUtil.simpleUUID());
+        refundDetails.add(refundDetail);
+
+        // 专项维修资金
+        String funds = payLogExtendMapper.getMoneyByContractId(contractManage.getId(), 2);
+        RefundDetailDto refundDetail2 = new RefundDetailDto();
+        refundDetail2.setType("专项维修资金");
+        refundDetail2.setReceivedAmount(new BigDecimal(funds));
+        refundDetail2.setUuid(IdUtil.simpleUUID());
+        refundDetails.add(refundDetail2);
+
         return refundDetails;
     }
 
-    public List<RefundDetail> listAll(RefundDetail model,DateTrans dt) {
+    public List<RefundDetail> listAll(RefundDetail model, DateTrans dt) {
         return modelMapper.selectByExample(getCondition(model, dt));
     }
 
 
-    private RefundDetailExample getCondition(RefundDetail model,DateTrans dt) {
+    private RefundDetailExample getCondition(RefundDetail model, DateTrans dt) {
         RefundDetailExample ex = new RefundDetailExample();
         ex.setOrderByClause("created_at");
         RefundDetailExample.Criteria criteria = ex.createCriteria();