diff --git a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java index 6b7618d..70cffe4 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java @@ -27,4 +27,6 @@ public interface CashRefundMapper { int executor(CashRecordDone cashRecordDone); int updateStatus(CashRecordDone cashRecordDone); + void addAudit(CashRecordDone cashRecordDone); + void updateAudit(CashRecordDone cashRecordDone); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 6db4aac..5175b98 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -65,6 +65,11 @@ public class CashRefundServiceImpl implements RefundService { if(cashRecordDone.getRefundReason()== null){ throw new Exception("请填写退款理由") ; } + CashRecordDone cashRecordDonetwo = new CashRecordDone(); + cashRecordDonetwo.setAreaServise(cashRecordDone.getAreaServise()); + cashRefundMapper.addAudit(cashRecordDonetwo); + cashRecordDone.setAuditId(cashRecordDonetwo.getId()); + cashRecordDone.setOrderType(2); cashRecordDone.setStatus(10); //生成订单号后半部分 @@ -112,6 +117,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); cashRecordDone1.setStatus(4); cashRefundMapper.updateStatus(cashRecordDone1); } + cashRefundMapper.updateAudit(cashRecordDone); int result = cashRefundMapper.review(cashRecordDone); return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode(); } @@ -186,7 +192,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100, userGoldRecord.getRemark(),(double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");} - + cashRefundMapper.updateAudit(cashRecordDone); int result = cashRefundMapper.review(cashRecordDone); return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode(); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 1dc2d17..6f9e2f3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -99,4 +99,5 @@ bean: url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge consume: url: http://39.101.133.168:8828/hljwgo/api/wallet/pay -server: \ No newline at end of file +server: + port: 10704 \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index f213d14..4385a95 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -64,6 +64,26 @@ #{refundVoucher} ); + + insert into lhl_audit + ( + id, + area_servise, + area_finance, + area_charge, + head_finance, + execcutor, + ) + values( + #{id}, + #{areaServise}, + #{areaFinance}, + #{areacharge}, + #{head_finance}, + #{executor} + ) + + update cash_record set @@ -102,6 +122,27 @@ + + update lhl_audit + + + area_servise = #{area_servise}, + + + area_finance = #{area_finance}, + + + area_charge = #{area_charge}, + + + head_finance = #{head_finance}, + + + execcutor = #{execcutor}, + + + where id = #{auditId} +