1

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

@@ -61,7 +61,7 @@ public class IntentionalDepositController extends BaseController {
     @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult add(IntentionalDeposit model){
-        int result = modelService.add(model);
+        int result = modelService.add(model,null);
         return result(result);
     }
 
@@ -73,7 +73,7 @@ public class IntentionalDepositController extends BaseController {
     @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult edit(IntentionalDeposit model){
-        int result = modelService.edit(model);
+        int result = modelService.edit(model,null);
         return result(result);
     }
 

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

@@ -74,6 +74,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private ParkFloorDiscService floorDiscService;
     @Autowired
     private ParkInfoService parkInfoService;
+    @Autowired
+    private IntentionalDepositService intentionalDepositService;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -361,6 +363,12 @@ public class CustomerManagementService implements BaseService<CustomerManagement
             String name = frameUser == null ? "" : frameUser.getTruename();
             result.setAbandonmentName(name);
         }
+        IntentionalDepositExample intentionalDepositExample = new IntentionalDepositExample();
+        intentionalDepositExample.createCriteria().andCustomerManagementIdEqualTo(id);
+        List<IntentionalDeposit> intentionalDeposits = intentionalDepositService.selectByExample(intentionalDepositExample);
+        if(CollectionUtils.isNotEmpty(intentionalDeposits)){
+            result.setIntentionalDepositStatus(intentionalDeposits.get(0).getStatus().toString());
+        }
 
         return result;
     }

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

@@ -32,6 +32,7 @@ import com.idea.paymentManagement.mapper.PayLogMapper;
 import com.idea.paymentManagement.mapper.RefundDetailMapper;
 import com.idea.paymentManagement.mapper.RefundManageMapper;
 import com.idea.paymentManagement.model.PayLog;
+import com.idea.paymentManagement.model.PayLogExample;
 import com.idea.paymentManagement.model.RefundDetail;
 import com.idea.paymentManagement.model.RefundManage;
 import com.idea.util.DateUtils;
@@ -207,8 +208,11 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
      * @param model
      * @return
      */
-    public int add(IntentionalDeposit model) {
+    public int add(IntentionalDeposit model, String userId) {
 
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
         String id = IdUtil.simpleUUID();
         // 已收取
@@ -216,9 +220,10 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         model.setGroupId(customerManagement.getGroupId());
         model.setDiscId(customerManagement.getDiscId());
         model.setCreatedAt(new Date());
-        model.setCreatedId(ShiroUtils.getUserId());
+        model.setCreatedId(userId);
         model.setId(id);
         int result = insertWithoutId(model);
+
         // 票据管理 新增一条记录
         ReceiptManage receiptManage = new ReceiptManage();
         receiptManage.setBatchNumber(customerManagement.getBatchNumber());
@@ -230,9 +235,10 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         receiptManage.setReceiptType("1");
         receiptManage.setReceiptMoney(model.getReceivedAmount());
         receiptManage.setReceiptNumber(model.getSerialNumber());
+        receiptManage.setCreatedId(userId);
         receiptManageService.add(receiptManage);
+
         // 收款记录 新增一条记录
-        // 新增一条意向金收款记录
         PayLog payLog = new PayLog();
         payLog.setId(IdUtil.simpleUUID());
         payLog.setHouseId(null);
@@ -247,8 +253,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         payLog.setPaymentMethod(model.getPaymentMethod());
         payLog.setStatus(0);
         payLog.setCreatedAt(new Date());
-        payLog.setCreatedBy(ShiroUtils.getUserId());
-        payLog.setSerialNumber(model.getDepositSerialNumber());
+        payLog.setCreatedBy(userId);
+        payLog.setSerialNumber(model.getSerialNumber());
         payLog.setIsHide(1);
         payLogMapper.insertSelective(payLog);
 
@@ -261,14 +267,43 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
      * @param model
      * @return
      */
-    public int edit(IntentionalDeposit model) {
+    public int edit(IntentionalDeposit model, String userId) {
 
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
         model.setGroupId(customerManagement.getGroupId());
         model.setDiscId(customerManagement.getDiscId());
         model.setUpdatedAt(new Date());
-        model.setUpdatedId(ShiroUtils.getUserId());
-        return updateByPrimaryKeySelective(model);
+        model.setUpdatedId(userId);
+        int result = updateByPrimaryKeySelective(model);
+
+        // 票据管理 修改一条记录
+        ReceiptManageExample receiptManageExample = new ReceiptManageExample();
+        receiptManageExample.createCriteria().andBusinessIdEqualTo(model.getId());
+        List<ReceiptManage> receiptManages = receiptManageService.selectByExample(receiptManageExample);
+        if(CollectionUtils.isNotEmpty(receiptManages)){
+            ReceiptManage receiptManage = receiptManages.get(0);
+            receiptManage.setReceiptMoney(model.getReceivedAmount());
+            receiptManage.setUpdatedAt(new Date());
+            receiptManage.setUpdatedId(userId);
+            receiptManageService.updateByPrimaryKeySelective(receiptManage);
+        }
+
+        // 收款记录 修改一条记录
+        PayLogExample payLogExample = new PayLogExample();
+        payLogExample.createCriteria().andCustomerManagementIdEqualTo(model.getCustomerManagementId());
+        List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
+        if(CollectionUtils.isNotEmpty(payLogs)){
+            PayLog payLog = payLogs.get(0);
+            payLog.setPayMoney(model.getReceivedAmount());
+            payLog.setUpdatedAt(new Date());
+            payLog.setUpdatedBy(userId);
+            payLogMapper.updateByPrimaryKeySelective(payLog);
+        }
+
+        return result;
     }
 
     /**
@@ -613,13 +648,13 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         try {
             String result = InvoiceUtil.gatheringbillAdd(json);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            if(jsonObject.getString("success").equals("true")){
+            if (jsonObject.getString("success").equals("true")) {
                 intentionalDeposit.setNcJson(result);
                 updateByPrimaryKeySelective(intentionalDeposit);
             }
 
         } catch (Exception e) {
-            log.error("收诚意金凭证推送报错",e);
+            log.error("收诚意金凭证推送报错", e);
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success();
@@ -627,10 +662,11 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
     /**
      * 诚意金转定金 凭证推送
+     *
      * @param id
      * @return
      */
-    public AjaxResult sendToDepositVoucher(String id){
+    public AjaxResult sendToDepositVoucher(String id) {
 
         IntentionalDeposit intentionalDeposit = selectByPrimaryKey(id);
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(intentionalDeposit.getCustomerManagementId());
@@ -680,13 +716,13 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         try {
             String result = InvoiceUtil.gatheringbillTurn(json);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            if(jsonObject.getString("success").equals("true")){
+            if (jsonObject.getString("success").equals("true")) {
                 intentionalDeposit.setTurnNcJson(result);
                 updateByPrimaryKeySelective(intentionalDeposit);
             }
 
         } catch (Exception e) {
-            log.error("诚意金转定金凭证推送报错",e);
+            log.error("诚意金转定金凭证推送报错", e);
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success();

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

@@ -136,7 +136,7 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
             model.setReceiptStatus(1);
         }
         model.setCreatedAt(new Date());
-        model.setCreatedId(ShiroUtils.getUserId());
+        model.setCreatedId(model.getCreatedId() == null ? ShiroUtils.getUserId() : model.getCreatedId());
         int result = insertSelective(model);
         return result;
     }

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

@@ -100,21 +100,6 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
         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);
 
         List<Map<String, String>> dictList = sysDictService.selectDictList("CONTENT_TYPE");
         List<PayLog> contentTypeMoney = payLogExtendMapper.getContentTypeMoneyByContractId(contractManage.getId(), 1);
@@ -127,6 +112,7 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
             }
             RefundDetailDto refundDetail = new RefundDetailDto();
             refundDetail.setType(type);
+            refundDetail.setContentType(payLog.getContentType());
             refundDetail.setReceivedAmount(payLog.getPayMoney());
             refundDetail.setUuid(IdUtil.simpleUUID());
             refundDetails.add(refundDetail);
@@ -137,6 +123,7 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
         String funds = payLogExtendMapper.getMoneyByContractId(contractManage.getId(), 2);
         RefundDetailDto refundDetail2 = new RefundDetailDto();
         refundDetail2.setType("专项维修资金");
+        refundDetail2.setContentType(4);
         refundDetail2.setReceivedAmount(new BigDecimal(funds));
         refundDetail2.setUuid(IdUtil.simpleUUID());
         refundDetails.add(refundDetail2);

pro-base/src/main/java/com/idea/transactionRecordManage/service/TransactionRecordService.java

@@ -69,13 +69,13 @@ public class TransactionRecordService {
         }
         // 收款记录
         List<NccRecordVo> list = modelMapper.collectionRecord(model);
-        for (NccRecordVo recordVo : list) {
-            for(Map<String, String> map : contentType){
-                if(recordVo.getContentType().equals(map.get("value"))){
-                    recordVo.setContentType(map.get("label"));
-                }
-            }
-        }
+//        for (NccRecordVo recordVo : list) {
+//            for(Map<String, String> map : contentType){
+//                if(recordVo.getContentType().equals(map.get("value"))){
+//                    recordVo.setContentType(map.get("label"));
+//                }
+//            }
+//        }
         PageInfo<NccRecordVo> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
@@ -85,13 +85,13 @@ public class TransactionRecordService {
         List<Map<String, String>> contentType = sysDictService.selectDictList("CONTENT_TYPE");
         // 收款记录
         List<NccRecordVo> list = modelMapper.collectionRecord(model);
-        for (NccRecordVo recordVo : list) {
-            for(Map<String, String> map : contentType){
-                if(recordVo.getContentType().equals(map.get("value"))){
-                    recordVo.setContentType(map.get("label"));
-                }
-            }
-        }
+//        for (NccRecordVo recordVo : list) {
+//            for(Map<String, String> map : contentType){
+//                if(recordVo.getContentType().equals(map.get("value"))){
+//                    recordVo.setContentType(map.get("label"));
+//                }
+//            }
+//        }
         return list;
     }
 
@@ -111,13 +111,13 @@ public class TransactionRecordService {
         }
         // 收款记录
         List<NccRecordVo> list = modelMapper.reFundRecord(model);
-        for (NccRecordVo recordVo : list) {
-            for(Map<String, String> map : contentType){
-                if(recordVo.getContentType().equals(map.get("value"))){
-                    recordVo.setContentType(map.get("label"));
-                }
-            }
-        }
+//        for (NccRecordVo recordVo : list) {
+//            for(Map<String, String> map : contentType){
+//                if(recordVo.getContentType().equals(map.get("value"))){
+//                    recordVo.setContentType(map.get("label"));
+//                }
+//            }
+//        }
         PageInfo<NccRecordVo> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
@@ -131,13 +131,13 @@ public class TransactionRecordService {
         }
         // 收款记录
         List<NccRecordVo> list = modelMapper.reFundRecord(model);
-        for (NccRecordVo recordVo : list) {
-            for(Map<String, String> map : contentType){
-                if(recordVo.getContentType().equals(map.get("value"))){
-                    recordVo.setContentType(map.get("label"));
-                }
-            }
-        }
+//        for (NccRecordVo recordVo : list) {
+//            for(Map<String, String> map : contentType){
+//                if(recordVo.getContentType().equals(map.get("value"))){
+//                    recordVo.setContentType(map.get("label"));
+//                }
+//            }
+//        }
         return list;
     }
 

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

@@ -6,7 +6,7 @@
   <select id="getMoneyByContractId" resultType="java.lang.String">
       select ifnull(sum(pay_money),0) from pay_log
       <where>
-          and is_hide != 1
+          and ifnull(is_hide,0) != 1
           <if test="contractId != null and contractId !=''">
               and contract_id = #{contractId}
           </if>
@@ -53,7 +53,7 @@
     <select id="getContentTypeMoneyByContractId" resultType="com.idea.paymentManagement.model.PayLog">
         select content_type,ifnull(sum(pay_money),0) as pay_money from pay_log
         <where>
-            and is_hide != 1
+            and ifnull(is_hide,0) != 1
             <if test="contractId != null and contractId !=''">
                 and contract_id = #{contractId}
             </if>

pro-base/src/main/resources/mybatis/transactionRecord/TransactionRecord.xml

@@ -6,13 +6,14 @@
         SELECT
             p.id,
             p.serial_number,
-            p.pay_money,
+            p.pay_money money,
             p.content_type,
             p.pay_time,
             p.payment_method,
             p.nc_submit_status,
             p.nc_submit_date,
             p.nc_submit_name,
+            p.bank_number,
             u.truename created_name,
             cm.house_name,
             cm.buyer_name
@@ -44,6 +45,7 @@
                 AND p.payment_method = #{paymentMethod}
             </if>
         </where>
+        order by cm.id,p.created_at desc
     </select>
 
     <select id="listByDate" resultType="com.idea.paymentManagement.model.PayLog">
@@ -54,6 +56,7 @@
     <select id="reFundRecord" resultType="com.idea.transactionRecordManage.vo.NccRecordVo">
         SELECT
             d.*,
+            d.actual_refund_amount money,
             r.customer_management_id,
             r.house_id,
             r.buyer_name,

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

@@ -30,10 +30,11 @@ public class WxIntentionalDepositController extends BaseController {
 
     /**
      * 获取意向金流水号
+     *
      * @param customerManagementId
      * @return
      */
-    @PostMapping(value = "getSerialNumber",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getSerialNumber", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public String getSerialNumber(String customerManagementId) {
         return modelService.getSerialNumber(customerManagementId);
@@ -42,10 +43,11 @@ public class WxIntentionalDepositController extends BaseController {
 
     /**
      * 获取定金金流水号
+     *
      * @param id
      * @return
      */
-    @PostMapping(value = "getDepositSerialNumber",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getDepositSerialNumber", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public String getDepositSerialNumber(String id) {
         return modelService.getDepositSerialNumber(id);
@@ -54,97 +56,100 @@ public class WxIntentionalDepositController extends BaseController {
 
     /**
      * 意向金登记
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "add", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult add(IntentionalDeposit model){
-        int result = modelService.add(model);
+    public AjaxResult add(IntentionalDeposit model, String userId) {
+        int result = modelService.add(model, userId);
         return result(result);
     }
 
     /**
      * 意向金修改
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "edit", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult edit(IntentionalDeposit model){
-        int result = modelService.edit(model);
+    public AjaxResult edit(IntentionalDeposit model, String userId) {
+        int result = modelService.edit(model, userId);
         return result(result);
     }
 
     /**
      * 根据客户id查找意向金
+     *
      * @param customerManagementId
      * @return
      */
-    @PostMapping(value = "getByCustomerManagementId",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getByCustomerManagementId", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object getByCustomerManagementId(String customerManagementId){
+    public Object getByCustomerManagementId(String customerManagementId) {
         return modelService.getByCustomerManagementId(customerManagementId);
     }
 
 
-    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "list", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object list(Tablepar tablepar, IntentionalDepositDto model, DateTrans dt){
-        PageInfo<IntentionalDepositDto> page= modelService.listByModel(tablepar,model,dt);
+    public Object list(Tablepar tablepar, IntentionalDepositDto model, DateTrans dt) {
+        PageInfo<IntentionalDepositDto> page = modelService.listByModel(tablepar, model, dt);
         TableSplitResult<IntentionalDepositDto> result = new TableSplitResult<IntentionalDepositDto>(page.getPageNum(), page.getTotal(), page.getList());
-        return  result;
+        return result;
     }
 
     /**
      * 意向金转定金
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "toDeposit",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "toDeposit", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult toDeposit(IntentionalDeposit model){
+    public AjaxResult toDeposit(IntentionalDeposit model) {
         int result = modelService.toDeposit(model);
         return result(result);
     }
 
     /**
      * 退意向金
+     *
      * @param model
      * @return
      */
-    @PostMapping(value = "refund",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "refund", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult refund(IntentionalDeposit model){
+    public AjaxResult refund(IntentionalDeposit model) {
         int result = modelService.refund(model);
         return result(result);
     }
 
     /**
      * 根据客户id查找意向金
+     *
      * @param id
      * @return
      */
-    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @PostMapping(value = "getById", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object getById(String id){
+    public Object getById(String id) {
         return modelService.getById(id);
     }
 
 
     /**
      * 意向金收据下载
+     *
      * @param model
      * @param response
      */
-    @GetMapping(value = "downLoadReceipt",produces = {"application/json;charset=UTF-8"})
+    @GetMapping(value = "downLoadReceipt", produces = {"application/json;charset=UTF-8"})
     public void downLoadReceipt(IntentionalDeposit model, HttpServletResponse response) {
-        modelService.downLoadReceipt(model,response);
+        modelService.downLoadReceipt(model, response);
     }
 
 
-
-
-
-
 }