From e5ac29afd5569196a54bd4f77457848afc7adf55 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 24 十月 2024 11:47:25 +0800
Subject: [PATCH] 2024-10-24 朱宝民 添加反写接口，完善各相关查询接口，兼容反写信息
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index cdd3d2d..d849c3f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -614,8 +614,7 @@
}
/**
- * 琛ユ墸
- *
+ * 琛ユ墸銆佸弽鍐�
* @param po
* @param bindingResult
* @return
@@ -633,10 +632,11 @@
* clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
* cardNum 姘村崱缂栧彿
* money 鍗＄墖浣欓
- * refund 琛ユ墸浣欓
+ * refund 琛ユ墸浣欓/鍙嶅啓閲戦
* remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
* refundTime 琛ユ墸鏃堕棿
+ * operateType 鎿嶄綔绫诲瀷锛�1-琛ユ墸锛�2-鍙嶅啓
*/
Long cardId = 0L;
Long clientId = 0L;
@@ -645,7 +645,7 @@
Float refund = po.getRefund();
String remarks = po.getRemarks();
Long operator = po.getOperator();
- Date refundTime = new Date();
+ Integer operateType = po.getOperateType();
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
@@ -685,16 +685,29 @@
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
seCardOperate.setClientId(clientId);
- seCardOperate.setMoney(money);
+ if(operateType == 1) {
+ // 琛ユ墸
+ seCardOperate.setMoney(money);
+ seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
+ }else {
+ // 鍙嶅啓
+ seCardOperate.setMoney(refund);
+ seCardOperate.setOperateType(OperateTypeENUM.WRITE_BACK.getCode());
+ }
+ //seCardOperate.setMoney(money);
seCardOperate.setRefundAmount(refund);
- seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
+ //seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
- seCardOperate.setOperateDt(refundTime);
+ seCardOperate.setOperateDt(new Date());
seCardOperate.setOperateValid((byte) 1);
Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
if (rec == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.REFUND_FAIL_WRITE_REFUND_ERROR.getMessage());
+ if(operateType == 1) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.REFUND_FAIL_WRITE_REFUND_ERROR.getMessage());
+ }else {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.WRITE_BACK_FAIL_WRITE_BACK_ERROR.getMessage());
+ }
}
return BaseResponseUtils.buildSuccess(true);
@@ -881,6 +894,16 @@
cardOperateSv.turnOperateValidByCardId(cardId, operateType);
cardOperateSv.updateRefund(operateType, cardId);
}
+ else if (operateType == 10) {
+ /**
+ * 鍙嶅啓鎿嶄綔鎵ц閫氱煡
+ * 1.鎿嶄綔璁板綍鏀逛负鏈夋晥
+ * 2.淇敼姘村崱琛ㄧ殑鎿嶄綔淇℃伅鍙婁綑棰�-浠庢搷浣滆褰曚腑鍙杕oney
+ * 璇存槑锛氳繑杩樻搷浣滆褰曚腑鐨刴oney灏辨槸鍙嶅啓閲戦
+ */
+ cardOperateSv.turnOperateValidByCardId(cardId, operateType);
+ cardOperateSv.updateWriteBack(operateType, cardId);
+ }
return BaseResponseUtils.buildSuccess();
}
--
Gitblit v1.8.0