1

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

@@ -42,7 +42,7 @@ public class RefundManageController extends BaseController {
     @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public Object getById(String id){
-        return modelService.selectByPrimaryKey(id);
+        return modelService.getById(id);
     }
 
     /**

pro-base/src/main/java/com/idea/paymentManagement/dto/RefundManageDto.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class RefundManageDto extends RefundManage {
 
-    private String RefundDetailServiceStr;
+    private String refundDetailInfoStr;
 
     private String houseName;
 
@@ -16,4 +16,6 @@ public class RefundManageDto extends RefundManage {
 
     private String contractNumber;
 
+    private String createdName;
+
 }

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

@@ -1,5 +1,8 @@
 package com.idea.paymentManagement.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -7,8 +10,12 @@ import java.util.Date;
 public class RefundManage implements Serializable {
     private String id;
 
+    private String houseId;
+
     private String contractId;
 
+    private String customerManagementId;
+
     private String approvalNumber;
 
     private String applicant;
@@ -29,6 +36,8 @@ public class RefundManage implements Serializable {
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
     private Date updatedAt;
@@ -49,6 +58,14 @@ public class RefundManage implements Serializable {
         this.id = id == null ? null : id.trim();
     }
 
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId == null ? null : houseId.trim();
+    }
+
     public String getContractId() {
         return contractId;
     }
@@ -57,6 +74,14 @@ public class RefundManage implements Serializable {
         this.contractId = contractId == null ? null : contractId.trim();
     }
 
+    public String getCustomerManagementId() {
+        return customerManagementId;
+    }
+
+    public void setCustomerManagementId(String customerManagementId) {
+        this.customerManagementId = customerManagementId == null ? null : customerManagementId.trim();
+    }
+
     public String getApprovalNumber() {
         return approvalNumber;
     }

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

@@ -176,6 +176,76 @@ public class RefundManageExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(String value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(String value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(String value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(String value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLike(String value) {
+            addCriterion("house_id like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotLike(String value) {
+            addCriterion("house_id not like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<String> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<String> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(String value1, String value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
         public Criteria andContractIdIsNull() {
             addCriterion("contract_id is null");
             return (Criteria) this;
@@ -246,6 +316,76 @@ public class RefundManageExample {
             return (Criteria) this;
         }
 
+        public Criteria andCustomerManagementIdIsNull() {
+            addCriterion("customer_management_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNotNull() {
+            addCriterion("customer_management_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdEqualTo(String value) {
+            addCriterion("customer_management_id =", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotEqualTo(String value) {
+            addCriterion("customer_management_id <>", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThan(String value) {
+            addCriterion("customer_management_id >", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThanOrEqualTo(String value) {
+            addCriterion("customer_management_id >=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThan(String value) {
+            addCriterion("customer_management_id <", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThanOrEqualTo(String value) {
+            addCriterion("customer_management_id <=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLike(String value) {
+            addCriterion("customer_management_id like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotLike(String value) {
+            addCriterion("customer_management_id not like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIn(List<String> values) {
+            addCriterion("customer_management_id in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotIn(List<String> values) {
+            addCriterion("customer_management_id not in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdBetween(String value1, String value2) {
+            addCriterion("customer_management_id between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotBetween(String value1, String value2) {
+            addCriterion("customer_management_id not between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
         public Criteria andApprovalNumberIsNull() {
             addCriterion("approval_number is null");
             return (Criteria) this;

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

@@ -1,5 +1,6 @@
 package com.idea.paymentManagement.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
@@ -7,11 +8,9 @@ import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.mapper.ParkRoomExtendMapper;
 import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.customerManagement.dto.ContractManageDto;
+import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
-import com.idea.customerManagement.model.Buyer;
-import com.idea.customerManagement.model.BuyerExample;
-import com.idea.customerManagement.model.RoomSelectionInfo;
-import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import com.idea.customerManagement.model.*;
 import com.idea.customerManagement.service.BuyerService;
 import com.idea.paymentManagement.dto.RefundManageDto;
 import com.idea.paymentManagement.mapper.RefundManageExtendMapper;
@@ -21,6 +20,8 @@ import com.idea.paymentManagement.model.RefundDetailExample;
 import com.idea.paymentManagement.model.RefundManage;
 import com.idea.paymentManagement.model.RefundManageExample;
 import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.mapper.FrameUserMapper;
+import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.TableSplitResult;
 import com.rockstar.frame.model.extend.Tablepar;
@@ -50,6 +51,10 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
     private RefundDetailService refundDetailService;
     @Autowired
     private RefundManageExtendMapper extendMapper;
+    @Autowired
+    private ContractManageMapper contractManageMapper;
+    @Autowired
+    private FrameUserMapper frameUserMapper;
 
 
     @Override
@@ -139,8 +144,16 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         String id = IdUtil.simpleUUID();
         String userId = ShiroUtils.getUserId();
         Date date = new Date();
-        List<RefundDetail> details = JSONObject.parseArray(model.getRefundDetailServiceStr(), RefundDetail.class);
+        List<RefundDetail> details = JSONObject.parseArray(model.getRefundDetailInfoStr(), RefundDetail.class);
+        Integer collectionStatus = null;
+        Integer fundCollectionStatus = null;
         for (RefundDetail detail : details){
+            if(detail.getType().equals("定金") || detail.getType().equals("房款")){
+                collectionStatus = 3;
+            }
+            if(detail.getType().equals("专项维修资金")){
+                fundCollectionStatus = 3;
+            }
             detail.setRefundManageId(id);
             detail.setCreatedId(userId);
             detail.setCreatedAt(date);
@@ -150,6 +163,12 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         model.setCreatedId(userId);
         model.setCreatedAt(date);
         int result = insertWithoutId(model);
+
+        // 更新合同 收款状态
+        ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
+        contractManage.setCollectionStatus(collectionStatus);
+        contractManage.setFundCollectionStatus(fundCollectionStatus);
+        contractManageMapper.updateByPrimaryKeySelective(contractManage);
         return result;
     }
 
@@ -171,7 +190,7 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
             refundDetailService.deleteByPrimaryKey(detail.getId());
         }
         // 再新增
-        List<RefundDetail> details = JSONObject.parseArray(model.getRefundDetailServiceStr(), RefundDetail.class);
+        List<RefundDetail> details = JSONObject.parseArray(model.getRefundDetailInfoStr(), RefundDetail.class);
         for (RefundDetail detail : details){
             detail.setRefundManageId(id);
             detail.setCreatedId(userId);
@@ -199,7 +218,16 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         return pageInfo;
     }
 
-
+    public RefundManageDto getById(String id){
+        RefundManage refundManage = selectByPrimaryKey(id);
+        RefundManageDto result = new RefundManageDto();
+        FrameUser frameUser = frameUserMapper.selectByPrimaryKey(refundManage.getCreatedId());
+        String userName = "";
+        userName = frameUser == null ? "" : frameUser.getTruename();
+        result.setCreatedName(userName);
+        BeanUtil.copyProperties(refundManage,result);
+        return result;
+    }
 
 
 

pro-base/src/main/resources/mybatis/paymentManagement/RefundManageMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.idea.paymentManagement.mapper.RefundManageMapper">
   <resultMap id="BaseResultMap" type="com.idea.paymentManagement.model.RefundManage">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
+    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="approval_number" jdbcType="VARCHAR" property="approvalNumber" />
     <result column="applicant" jdbcType="VARCHAR" property="applicant" />
     <result column="identity_card" jdbcType="VARCHAR" property="identityCard" />
@@ -81,9 +83,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, contract_id, approval_number, applicant, identity_card, reason, buyer_name, refund_amount,
-    actual_refund_amount, deductible, bank_number, created_id, created_at, updated_at,
-    updated_id
+    id, house_id, contract_id, customer_management_id, approval_number, applicant, identity_card,
+    reason, buyer_name, refund_amount, actual_refund_amount, deductible, bank_number,
+    created_id, created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list
@@ -137,18 +139,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.paymentManagement.model.RefundManage">
-    insert into refund_manage (id, contract_id, approval_number,
-                               applicant, identity_card, reason,
-                               buyer_name, refund_amount, actual_refund_amount,
-                               deductible, bank_number, created_id,
-                               created_at, updated_at, updated_id,
-                               remark, file_list)
-    values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{approvalNumber,jdbcType=VARCHAR},
-            #{applicant,jdbcType=VARCHAR}, #{identityCard,jdbcType=VARCHAR}, #{reason,jdbcType=INTEGER},
-            #{buyerName,jdbcType=VARCHAR}, #{refundAmount,jdbcType=DECIMAL}, #{actualRefundAmount,jdbcType=DECIMAL},
-            #{deductible,jdbcType=DECIMAL}, #{bankNumber,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR},
-            #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR},
-            #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR})
+    insert into refund_manage (id, house_id, contract_id,
+                               customer_management_id, approval_number, applicant,
+                               identity_card, reason, buyer_name,
+                               refund_amount, actual_refund_amount, deductible,
+                               bank_number, created_id, created_at,
+                               updated_at, updated_id, remark,
+                               file_list)
+    values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
+            #{customerManagementId,jdbcType=VARCHAR}, #{approvalNumber,jdbcType=VARCHAR}, #{applicant,jdbcType=VARCHAR},
+            #{identityCard,jdbcType=VARCHAR}, #{reason,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR},
+            #{refundAmount,jdbcType=DECIMAL}, #{actualRefundAmount,jdbcType=DECIMAL}, #{deductible,jdbcType=DECIMAL},
+            #{bankNumber,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+            #{fileList,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.RefundManage">
     insert into refund_manage
@@ -156,9 +160,15 @@
       <if test="id != null">
         id,
       </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
       <if test="contractId != null">
         contract_id,
       </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
       <if test="approvalNumber != null">
         approval_number,
       </if>
@@ -209,9 +219,15 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="contractId != null">
         #{contractId,jdbcType=VARCHAR},
       </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="approvalNumber != null">
         #{approvalNumber,jdbcType=VARCHAR},
       </if>
@@ -271,9 +287,15 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractId != null">
         contract_id = #{record.contractId,jdbcType=VARCHAR},
       </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="record.approvalNumber != null">
         approval_number = #{record.approvalNumber,jdbcType=VARCHAR},
       </if>
@@ -327,7 +349,9 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update refund_manage
     set id = #{record.id,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     approval_number = #{record.approvalNumber,jdbcType=VARCHAR},
     applicant = #{record.applicant,jdbcType=VARCHAR},
     identity_card = #{record.identityCard,jdbcType=VARCHAR},
@@ -350,7 +374,9 @@
   <update id="updateByExample" parameterType="map">
     update refund_manage
     set id = #{record.id,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     approval_number = #{record.approvalNumber,jdbcType=VARCHAR},
     applicant = #{record.applicant,jdbcType=VARCHAR},
     identity_card = #{record.identityCard,jdbcType=VARCHAR},
@@ -371,9 +397,15 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.idea.paymentManagement.model.RefundManage">
     update refund_manage
     <set>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="contractId != null">
         contract_id = #{contractId,jdbcType=VARCHAR},
       </if>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="approvalNumber != null">
         approval_number = #{approvalNumber,jdbcType=VARCHAR},
       </if>
@@ -424,7 +456,9 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.paymentManagement.model.RefundManage">
     update refund_manage
-    set contract_id = #{contractId,jdbcType=VARCHAR},
+    set house_id = #{houseId,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         approval_number = #{approvalNumber,jdbcType=VARCHAR},
         applicant = #{applicant,jdbcType=VARCHAR},
         identity_card = #{identityCard,jdbcType=VARCHAR},
@@ -444,7 +478,9 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.paymentManagement.model.RefundManage">
     update refund_manage
-    set contract_id = #{contractId,jdbcType=VARCHAR},
+    set house_id = #{houseId,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         approval_number = #{approvalNumber,jdbcType=VARCHAR},
         applicant = #{applicant,jdbcType=VARCHAR},
         identity_card = #{identityCard,jdbcType=VARCHAR},