1

pro-base/src/main/java/com/idea/buildManage/excel/ParkRoomListener.java

@@ -294,7 +294,10 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
                         data.setTwoPointTwo(excel.getTwoPointTwo());
                         data.setRoomNumber(excel.getRoomNumber());
                         data.setRemark(excel.getRemark());
-
+                        // 默认待售
+                        data.setSoldStatus(1);
+                        // 选房状态
+                        data.setIsChoose(0);
 
                         list.add(data);
                     } else {

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

@@ -200,9 +200,12 @@ public class ContractManageService implements BaseService<ContractManage, Contra
             example.createCriteria().andCustomerManagementIdEqualTo(model.getCustomerManagementId());
             List<RoomSelectionInfo> list = roomSelectionInfoMapper.selectByExample(example);
             for(RoomSelectionInfo roomSelectionInfo : list){
-                // 已签约转房款
-                roomSelectionInfo.setStatus(4);
-                roomSelectionInfoMapper.updateByPrimaryKeySelective(roomSelectionInfo);
+                // 已收取或意向金转入 状态的
+                if(roomSelectionInfo.getStatus() == 2 || roomSelectionInfo.getStatus() == 3){
+                    // 已签约转房款
+                    roomSelectionInfo.setStatus(4);
+                    roomSelectionInfoMapper.updateByPrimaryKeySelective(roomSelectionInfo);
+                }
             }
         }
         int result = updateByPrimaryKeySelective(model);

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

@@ -208,6 +208,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
      * @param model
      * @return
      */
+    @Transactional
     public int add(IntentionalDeposit model, String userId) {
 
         if(StringUtils.isEmpty(userId)){
@@ -267,6 +268,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
      * @param model
      * @return
      */
+    @Transactional
     public int edit(IntentionalDeposit model, String userId) {
 
         if(StringUtils.isEmpty(userId)){
@@ -719,7 +721,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
             String result = InvoiceUtil.gatheringbillTurn(json);
             JSONObject jsonObject = JSONObject.parseObject(result);
             if (jsonObject.getString("success").equals("true")) {
-                intentionalDeposit.setTurnNcJson(result);
+                intentionalDeposit.setNcJson(result);
                 updateByPrimaryKeySelective(intentionalDeposit);
             }
 

pro-base/src/main/java/com/idea/invoice/controller/ReceiptManageController.java

@@ -37,7 +37,7 @@ public class ReceiptManageController extends BaseController {
 
 
     /**
-     * 意向金收据下载
+     * 票据下载
      * @param id
      * @param response
      */

pro-base/src/main/java/com/idea/invoice/service/ReceiptManageService.java

@@ -183,7 +183,7 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
                 if (StringUtils.isNotEmpty(dictLabel)) {
                     paymentMethod = dictLabel;
                 }
-                content = "意向金";
+                content = "定金";
                 break;
             case "3":
                 fileName = "首期收据.docx";