1

pro-base/src/main/java/com/idea/customerManagement/controller/RoomSelectionInfoController.java

@@ -33,8 +33,8 @@ public class RoomSelectionInfoController extends BaseController {
      */
     @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(String customerManagementId){
-        List<RoomSelectionInfoDto> result = modelService.listAll(customerManagementId);
+    public Object list(String customerManagementId,String id){
+        List<RoomSelectionInfoDto> result = modelService.listAll(customerManagementId,id);
         return result;
     }
 

pro-base/src/main/java/com/idea/customerManagement/dto/IntentionalDepositDto.java

@@ -25,5 +25,7 @@ public class IntentionalDepositDto extends IntentionalDeposit {
      */
     private String pkInformerId;
 
+    private String roomSelectionInfoId;
+
 
 }

pro-base/src/main/java/com/idea/customerManagement/mapper/RoomSelectionInfoExtendMapper.java

@@ -1,16 +1,14 @@
 package com.idea.customerManagement.mapper;
 
-import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.customerManagement.dto.RoomSelectionInfoDto;
-import com.idea.customerManagement.model.RoomSelectionInfo;
-import com.idea.customerManagement.model.RoomSelectionInfoExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface RoomSelectionInfoExtendMapper {
 
-    List<RoomSelectionInfoDto> selectHouseListByCustomerId(@Param("customerManagementId") String customerManagementId);
+    List<RoomSelectionInfoDto> selectHouseList(@Param("customerManagementId") String customerManagementId,
+                                               @Param("id") String id);
 
     List<RoomSelectionInfoDto> listByModel(RoomSelectionInfoDto record);
 }

pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

@@ -572,6 +572,22 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         }
         BeanUtil.copyProperties(intentionalDeposit, intentionalDepositDto);
         intentionalDepositDto.setHandleName(handleName);
+        // 查询是否存在房间选择信息 (针对先选房 而非 从意向金转定金时 选房)
+        if(StringUtils.isEmpty(intentionalDeposit.getHouseId())){
+            RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+            example.createCriteria().andCustomerManagementIdEqualTo(intentionalDeposit.getCustomerManagementId());
+            List<RoomSelectionInfo> list = roomSelectionInfoMapper.selectByExample(example);
+            if(CollectionUtils.isNotEmpty(list)){
+                RoomSelectionInfo roomSelectionInfo = list.get(0);
+                ParkRoomResponse response = roomExtendMapper.getFullName(roomSelectionInfo.getHouseId());
+                intentionalDepositDto.setRoomSelectionInfoId(roomSelectionInfo.getId());
+                intentionalDepositDto.setHouseId(roomSelectionInfo.getHouseId());
+                intentionalDepositDto.setHouseName(response.getBuildName() + "-" + response.getRoomNo());
+            }
+
+        }
+
+
         return intentionalDepositDto;
     }
 

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -1,18 +1,14 @@
 package com.idea.customerManagement.service;
 
-import cn.hutool.core.math.Money;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.idea.buildManage.mapper.MnpBuildingMapper;
 import com.idea.buildManage.mapper.ParkRoomExtendMapper;
 import com.idea.buildManage.mapper.ParkRoomMapper;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
-import com.idea.customerManagement.dto.ContractManageDto;
-import com.idea.customerManagement.dto.IntentionalDepositDto;
 import com.idea.customerManagement.dto.RoomSelectionInfoDto;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper;
@@ -44,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.*;
 
 @Slf4j
@@ -129,8 +124,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
      * @param customerManagementId
      * @return
      */
-    public List<RoomSelectionInfoDto> listAll(String customerManagementId) {
-        List<RoomSelectionInfoDto> result = extendMapper.selectHouseListByCustomerId(customerManagementId);
+    public List<RoomSelectionInfoDto> listAll(String customerManagementId,String id) {
+        List<RoomSelectionInfoDto> result = extendMapper.selectHouseList(customerManagementId,id);
         return result;
     }
 

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

@@ -63,7 +63,7 @@ public class PayLogController extends BaseController {
     @PostMapping(value = "remove",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult remove(String id){
-        int result = modelService.deleteByPrimaryKey(id);
+        int result = modelService.delete(id);
         return result(result);
     }
 
@@ -102,6 +102,20 @@ public class PayLogController extends BaseController {
         modelService.downLoadReceipt(id,response);
     }
 
+    /**
+     * 定金转首款 转房款
+     * @param id
+     * @param type
+     * @return
+     */
+    @PostMapping(value = "convertType",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult convertType(String id,Integer type){
+        int result = modelService.convertType(id, type);
+        return result(result);
+    }
+
+
 
 
 

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

@@ -26,6 +26,7 @@ import com.idea.invoice.dto.InvoiceManageDto;
 import com.idea.invoice.model.InvoiceManage;
 import com.idea.invoice.model.InvoiceManageExample;
 import com.idea.invoice.model.ReceiptManage;
+import com.idea.invoice.model.ReceiptManageExample;
 import com.idea.invoice.service.InvoiceManageService;
 import com.idea.invoice.service.ReceiptManageService;
 import com.idea.invoice.util.InvoiceConstant;
@@ -542,13 +543,44 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         return AjaxResult.success();
     }
 
-//    public int convertType(String id,int type){
-//        PayLog payLog = selectByPrimaryKey(id);
-//        payLog.
-//    }
 
+    /**
+     * 转首款 转房款
+     * @param id
+     * @param type
+     * @return
+     */
+    public int convertType(String id,Integer type){
+        PayLog payLog = selectByPrimaryKey(id);
+        // 转首款
+        if(type == 1){
+            payLog.setContentType(8);
+            payLog.setPaymentStatus(3);
+        }
+        // 转房款
+        if(type == 2){
+            payLog.setContentType(9);
+            payLog.setPaymentStatus(4);
+        }
+        return updateByPrimaryKeySelective(payLog);
+    }
+
+
+    public int delete(String id){
 
+        PayLog payLog = modelMapper.selectByPrimaryKey(id);
+        payLog.setStatus(1);
+        int result = modelMapper.updateByPrimaryKeySelective(payLog);
+        //删除票据管理里对应的几率
+        ReceiptManageExample receiptManageExample = new ReceiptManageExample();
+        receiptManageExample.createCriteria().andBusinessIdEqualTo(id);
+        List<ReceiptManage> receiptManages = receiptManageService.selectByExample(receiptManageExample);
+        if(CollectionUtils.isNotEmpty(receiptManages)){
+            receiptManageService.deleteByPrimaryKey(receiptManages.get(0).getId());
+        }
+        return result;
 
+    }
 
 
 

pro-base/src/main/resources/mybatis/customerManagement/RoomSelectionInfoExtendMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper">
 
-  <select id="selectHouseListByCustomerId" resultType="com.idea.customerManagement.dto.RoomSelectionInfoDto">
+  <select id="selectHouseList" resultType="com.idea.customerManagement.dto.RoomSelectionInfoDto">
     select room_selection_info.*,
            mnp_building.build_num buildName,
            park_room.room_no,
@@ -21,6 +21,9 @@
         <if test="customerManagementId !=null and customerManagementId != ''">
             and room_selection_info.customer_management_id = #{customerManagementId}
         </if>
+        <if test="id !=null and id != ''">
+            and room_selection_info.id = #{id}
+        </if>
     </where>
   </select>
 

pro-wx/src/main/java/com/idea/pro/wx/controller/customerManagement/WxRoomSelectionInfoController.java

@@ -35,8 +35,8 @@ public class WxRoomSelectionInfoController extends BaseController {
      */
     @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(String customerManagementId){
-        List<RoomSelectionInfoDto> result = modelService.listAll(customerManagementId);
+    public Object list(String customerManagementId,String id){
+        List<RoomSelectionInfoDto> result = modelService.listAll(customerManagementId,id);
         return result;
     }