diff --git a/src/main/java/com/example/demo/controller/cash/CashAuditController.java b/src/main/java/com/example/demo/controller/cash/CashAuditController.java index f4571c9..0ace10f 100644 --- a/src/main/java/com/example/demo/controller/cash/CashAuditController.java +++ b/src/main/java/com/example/demo/controller/cash/CashAuditController.java @@ -34,7 +34,7 @@ public class CashAuditController { @PostMapping("/collectionAudit") public ResponseEntity collectionAudit( @RequestBody AuditRequest request){ - boolean result = cashAuditService.auditCollection(request.getToken(),request.getOrderCode(), request.getAction(),request.getRejectReason()); + boolean result = cashAuditService.auditCollection(request.getToken(),request.getAuditId(),request.getOrderCode(), request.getAction(),request.getRejectReason()); return ResponseEntity.ok(result); } } diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 4ba119f..b898547 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -63,9 +63,9 @@ public class CashCollectionController { return Result.error(e.getMessage()); } } - //多条件查询收款订单列表----客服版 - @PostMapping("/selectCollection1") - public PageInfo selectCollection1( + //多条件查询收款订单列表 + @PostMapping("/selectCollection") + public PageInfo selectCollection( @RequestBody Page page) throws Exception{ Integer pageNum = page.getPageNum(); Integer pageSize = page.getPageSize(); @@ -79,6 +79,15 @@ public class CashCollectionController { cashCollection.setMarkets(list); } - return cashCollectionService.selectCollection1(pageNum, pageSize, cashCollection); + return cashCollectionService.selectCollection(pageNum, pageSize, cashCollection); + } + //补全手续费等 + @PostMapping("/complete") + public Result complete(@RequestBody CashRecord cashRecord) { + try { + return cashCollectionService.complete(cashRecord); + }catch (Exception e){ + return Result.error(e.getMessage()); + } } } diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java index 690cc3e..36de1fe 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -57,9 +57,11 @@ public class CashRecord implements Serializable { private String voucher; // 转账凭证 private String remark; // 备注 private String rejectReason; // 驳回理由 + private Integer auditId; //审核人Id + private String receivedRemark; // 到账备注 // 退款专用字段 - private String refundReason; // 退款备注（客服填写） + private String refundReason; // 退款原因（客服填写） private Integer refundModel; // 退款方式：0-全额，1-部分 private Integer executor; // 退款执行人 OA 号 private String refundChannels; // 退款途径 diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 8787f46..f01ba91 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -54,7 +54,9 @@ public class CashCollection implements Serializable { private String submitterName; // 提交人 姓名 private String voucher; // 转账凭证 private String remark; // 备注 + private String receivedRemark; //到账备注 private String rejectReason; // 驳回理由 + private String auditId; //审核人id @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java index 94db695..71d028d 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java @@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Param; **/ @Mapper public interface CashAuditMapper { - //更新订单 + //审核收款订单 void updateOrder (CashRecord updateOrder); } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 8673abf..f51def2 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -37,4 +37,6 @@ public interface CashCollectionMapper { //根据订单号查询待审核的现金收款订单 CashRecord selectUnAuditByOrderCode(@Param("orderCode") String orderCode); + //补全手续费等信息 + int complete(@Param("cashRecord") CashRecord cashRecord); } diff --git a/src/main/java/com/example/demo/service/cash/CashAuditService.java b/src/main/java/com/example/demo/service/cash/CashAuditService.java index 006195b..bfca84a 100644 --- a/src/main/java/com/example/demo/service/cash/CashAuditService.java +++ b/src/main/java/com/example/demo/service/cash/CashAuditService.java @@ -11,5 +11,5 @@ package com.example.demo.service.cash; public interface CashAuditService { //审核收款订单 - boolean auditCollection(String token, String orderCode, Integer action, String rejectReason); + boolean auditCollection(String token,Integer auditId, String orderCode, Integer action, String rejectReason); } diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index ce136a1..7e9e8fd 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -22,5 +22,7 @@ public interface CashCollectionService { //编辑并重新提交收款订单 Result reSubmit(CashRecord cashRecord); //多条件查询收款订单列表 - PageInfo selectCollection1(Integer pageNum, Integer pageSize, CashCollection cashCollection); + PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection); + //补全手续费等 + Result complete(CashRecord cashRecord); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index 86948fc..55b9bc2 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.domain.entity.CashRecord; import com.example.demo.mapper.cash.CashAuditMapper; import com.example.demo.mapper.cash.CashCollectionMapper; +import com.example.demo.mapper.coin.AuditMapper; import com.example.demo.service.cash.CashAuditService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,18 +20,23 @@ import org.springframework.transaction.annotation.Transactional; @Service public class CashAuditServiceImpl implements CashAuditService { @Autowired + private AuditMapper auditMapper; + @Autowired private CashCollectionMapper cashCollectionMapper; @Autowired private CashAuditMapper cashAuditMapper; @Transactional @Override - public boolean auditCollection(String token, String orderCode, Integer action, String rejectReason) { + public boolean auditCollection(String token,Integer auditId, String orderCode, Integer action, String rejectReason) { CashRecord order = cashCollectionMapper.selectUnAuditByOrderCode(orderCode); + if (order==null || order.getStatus()!=0){ throw new IllegalArgumentException("订单不存在或已被审核"); } - //判断是通过还是驳回，更新审核状态 CashRecord updateOrder = new CashRecord(); + //设置审核人 + updateOrder.setAuditId(auditId); + //判断是通过还是驳回，更新审核状态 updateOrder.setOrderCode(orderCode); if (action==1){ //通过 updateOrder.setStatus(1); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 2e01654..7a572e6 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -167,7 +167,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { } //多条件查询收款订单列表 @Override - public PageInfo selectCollection1(Integer pageNum, Integer pageSize, CashCollection cashCollection) { + public PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection) { //将操作人的地区列表改为id List markets = marketMapper.getMarketIds(cashCollection.getMarkets()); if (markets.contains("9") || markets.contains("9999")){ @@ -178,4 +178,11 @@ public class CashCollectionServiceImpl implements CashCollectionService { List cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection); return new PageInfo<>(cashCollections); } + //补全手续费等内容 + @Override + public Result complete(CashRecord cashRecord) { + int rows = cashCollectionMapper.complete(cashRecord); + + return rows > 0 ? Result.success("编辑成功") : Result.error("编辑失败"); + } } diff --git a/src/main/resources/cashMapper/CashAuditMapper.xml b/src/main/resources/cashMapper/CashAuditMapper.xml index 9de8075..ea979ba 100644 --- a/src/main/resources/cashMapper/CashAuditMapper.xml +++ b/src/main/resources/cashMapper/CashAuditMapper.xml @@ -2,11 +2,13 @@ - + update cash_record set status=#{status}, - reject_reason=#{rejectReason} - where order_code=#{orderCode} and status=0 + reject_reason=#{rejectReason}, + audit_id=#{auditId}, + audit_time=now() + where order_code=#{orderCode} and status=0 \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 48f68de..98f288e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -16,6 +16,7 @@ #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, #{status},#{submitterId},#{voucher},#{remark}) + update cash_record @@ -44,6 +45,19 @@ WHERE order_code = #{cashRecord.orderCode} AND status = 5 + + + update cash_record + set handling_charge=#{cashRecord.handlingCharge}, + received_currency=#{cashRecord.receivedCurrency}, + received_amount=#{cashRecord.receivedAmount}, + received_time=#{cashRecord.receivedTime}, + received_remark= #{cashRecord.receivedRemark}, + status=4, + bank_code= #{cashRecord.bankCode} + where order_code=#{cashRecord.orderCode} and status in (1,3) + +