From 1473f665730d9adc30011691e7a1ec04ce134709 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 14 九月 2024 08:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 5daf122..86bd4d3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -8,10 +8,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoSe.*;
-import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
-import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
-import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
+import com.dy.pipIrrGlobal.pojoSe.*;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
@@ -61,6 +58,9 @@
@Autowired
private SePaymentMethodMapper sePaymentMethodMapper;
+
+ @Autowired
+ private SeRechargeHistoryMapper seRechargeHistoryMapper;
@Value("${project.projectNo}")
private Integer projectNo;
@@ -146,7 +146,7 @@
/**
* 娣诲姞鍏呭�艰褰�
- * 淇敼鍐滄埛淇℃伅銆佹坊鍔犲厖鍊艰褰�
+ * 淇敼鍐滄埛淇℃伅銆佹坊鍔犳按鍗℃搷浣滆褰曘�佹坊鍔犲厖鍊艰褰�
* @param po
* @return
*/
@@ -208,18 +208,19 @@
seClientCard.setId(cardId);
seClientCard.setMoney(afterRecharge);
seClientCard.setRechargedt(rechargeTime);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
- }else {
- seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
+ //}else {
+ // seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
+ //}
+ seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞鍏呭�艰褰�
+ * 娣诲姞姘村崱鍏呭�兼搷浣滆褰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -227,11 +228,12 @@
seCardOperate.setMoney(money);
seCardOperate.setTradeAmount(amount);
seCardOperate.setGift(gift);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
- }else {
- seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
+ //}
+ seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
seCardOperate.setPaymentId(paymentId);
seCardOperate.setPrice(price);
seCardOperate.setRemarks(remarks);
@@ -241,7 +243,28 @@
seCardOperateMapper.insert(seCardOperate);
Long rec = Optional.ofNullable(seCardOperate.getId()).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
+ }
+
+ /**
+ * 娣诲姞鍏呭�煎巻鍙茶褰�
+ */
+ SeRechargeHistory seRechargeHistory = new SeRechargeHistory();
+ seRechargeHistory.setCardid(cardId);
+ seRechargeHistory.setClientid(clientId);
+ seRechargeHistory.setMoney(money);
+ seRechargeHistory.setAmount(amount);
+ seRechargeHistory.setGift(gift);
+ seRechargeHistory.setAfterrecharge(afterRecharge);
+ seRechargeHistory.setPaymentid(paymentId);
+ seRechargeHistory.setPrice(price);
+ seRechargeHistory.setRemarks(remarks);
+ seRechargeHistory.setOperator(operator);
+ seRechargeHistory.setOperatedt(rechargeTime);
+ seRechargeHistoryMapper.insert(seRechargeHistory);
+ Long rec_seRechargeHistory = Optional.ofNullable(seRechargeHistory.getId()).orElse(0L);
+ if(rec_seRechargeHistory == 0) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_HISTORY_ERROR.getMessage());
}
Map map_response = new HashMap();
@@ -307,12 +330,13 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L);
- QueryResultVo rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoTradeDetails>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = vo.pageSize ;
rsVo.pageCurr = vo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params);
+ rsVo.obj = seCardOperateMapper.getTransactions(params);
+ List<VoTradeDetails> list = rsVo.obj;
if(list.size() == 0) {
return new HashMap();
}
@@ -338,15 +362,13 @@
}
Map map_record = new HashMap();
- map_record.put("itemTotal", itemTotal);
- map_record.put("list", list);
+ map_record.put("list", rsVo);
Map map_result = new HashMap();
map_result.put("waterCost", df.format(totalWaterCost));
map_result.put("cardCost", df.format(totalCardCost));
map_result.put("gift", df.format(totalGift));
map_result.put("refund", df.format(totalRefund));
-
map_result.put("records", map_record);
--
Gitblit v1.8.0