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 9e3effd..cb79b6e 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -68,7 +68,7 @@ public class CashCollectionController { } //撤回未审核的收款订单 @PostMapping("/cancel") - public Result cancel(@RequestBody CashRecord cashRecord) { + public Result cancel(@RequestBody CashCollection cashRecord) { try { return Result.success( cashCollectionService.cancel(cashRecord.getOrderCode())); diff --git a/src/main/resources/cashMapper/CashAuditMapper.xml b/src/main/resources/cashMapper/CashAuditMapper.xml index 28e36a4..cba43c8 100644 --- a/src/main/resources/cashMapper/CashAuditMapper.xml +++ b/src/main/resources/cashMapper/CashAuditMapper.xml @@ -4,7 +4,7 @@ - update cash_record + update cash_record_collection set status=#{status}, reject_reason=#{rejectReason}, audit_id=#{auditId}, @@ -13,7 +13,7 @@ \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 1a85cc9..beddb7e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -12,7 +12,7 @@ pay_type,pay_time,status,submitter_id,submitter_market, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, - #{orderCode},#{goodsName},#{goodNum},#{NumUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, + #{orderCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark}) @@ -43,10 +43,9 @@ activity = #{cashRecordCollection.activity}, goods_name = #{cashRecordCollection.goodsName}, good_num = #{cashRecordCollection.goodNum}, - num_unit = #{cashRecordCollection.NumUnit}, + num_unit = #{cashRecordCollection.numUnit}, permanent_gold = #{cashRecordCollection.permanentGold}, free_gold = #{cashRecordCollection.freeGold}, - Num_unit = #{cashRecordCollection.NumUnit}, payment_currency = #{cashRecordCollection.paymentCurrency}, payment_amount = #{cashRecordCollection.paymentAmount}, received_market = #{cashRecordCollection.receivedMarket}, @@ -63,23 +62,23 @@ UPDATE cash_record_collection - + handling_charge = #{cashRecordCollection.handlingCharge}, - + received_currency = #{cashRecordCollection.receivedCurrency}, - + received_amount = #{cashRecordCollection.receivedAmount}, - + received_time = #{cashRecordCollection.receivedTime}, - + payment_currency = #{cashRecordCollection.paymentCurrency}, - + payment_amount = #{cashRecordCollection.paymentAmount}, @@ -111,7 +110,7 @@ @@ -218,7 +217,7 @@ payment_currency,payment_amount,pay_type,pay_time,crc.status,submitter_id, voucher,remark from cash_record_collection crc - left join recharge_activity ra on ra.id = cash_record.activity + left join recharge_activity ra on ra.id = crc.activity where order_code=#{orderCode}