From 2a366a390563e3f62f1b769ec6a1b1926cafa7e4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 10:28:03 +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 | 485 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 404 insertions(+), 81 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 2fabd7b..b144bb3 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
@@ -7,12 +7,18 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
+import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.*;
-import com.dy.pipIrrGlobal.pojoSe.*;
+import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
+import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
+import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory;
+import com.dy.pipIrrGlobal.voRm.VoExpend;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.cardOperate.qo.*;
+import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.result.SellResultCode;
@@ -23,6 +29,7 @@
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
+import java.time.Duration;
import java.util.*;
/**
@@ -62,11 +69,15 @@
@Autowired
private SeRechargeHistoryMapper seRechargeHistoryMapper;
+ @Autowired
+ private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapper;
+
@Value("${project.projectNo}")
private Integer projectNo;
/**
* 娣诲姞寮�鍗¤褰�
+ *
* @param po 姘村崱鎿嶄綔瀵硅薄
* @return 寮�鍗¤褰曚富閿�
*/
@@ -77,6 +88,7 @@
/**
* 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮侊紝寮�鍗′娇鐢�
+ *
* @param clientNum 鍐滄埛缂栧彿
* @return 5绾ц鏀垮尯鍒掍唬鐮�
*/
@@ -90,6 +102,7 @@
/**
* 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤
+ *
* @param clientId
* @return
*/
@@ -99,6 +112,7 @@
/**
* 鏍规嵁琛屾斂鍖哄垝涓叉ā鍧楁煡璇㈡按鍗＄紪鍙凤紝寮�鍗′娇鐢�
+ *
* @param areaCode
* @return
*/
@@ -108,6 +122,7 @@
/**
* 鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈢鐞嗗崱缂栧彿锛屽垱寤虹鐞嗗崱浣跨敤
+ *
* @param areaCode
* @return
*/
@@ -117,6 +132,7 @@
/**
* 鍒涘缓绠＄悊鍗�
+ *
* @param po
* @return
*/
@@ -127,6 +143,7 @@
/**
* 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID锛屽紑鍗′娇鐢�
+ *
* @param clientNum
* @return
*/
@@ -136,6 +153,7 @@
/**
* 娣诲姞姘村崱鎿嶄綔瀵硅薄锛屽悇鎿嶄綔閮戒娇鐢�
+ *
* @param po 姘村崱鎿嶄綔瀵硅薄
* @return 鎿嶄綔璁板綍涓婚敭
*/
@@ -147,10 +165,11 @@
/**
* 娣诲姞鍏呭�艰褰�
* 淇敼鍐滄埛淇℃伅銆佹坊鍔犳按鍗℃搷浣滆褰曘�佹坊鍔犲厖鍊艰褰�
+ *
* @param po
* @return
*/
- public BaseResponse<Boolean> addRecharge(DtoRecharge po){
+ public BaseResponse<Boolean> addRecharge(DtoRecharge po) {
/**
* cardId 姘村崱缂栧彿锛堜緷鎹按鍗＄紪鍙疯幏鍙栵級
* clientId 鍐滄埛缂栧彿锛堜緷鎹按鍗＄紪鍙疯幏鍙栵級
@@ -178,9 +197,16 @@
Long operator = po.getOperator();
Date rechargeTime = new Date();
- // 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
+ // 鑾峰彇姘村崱鐘舵��
String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
- if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
+
+ // 鍗曠嫭鍏呭�兼椂鍗＄墖蹇呴』涓烘甯�
+ if (remarks.trim().equals("鍏呭��") && !stateName.equals("姝ｅ父")) {
+ return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
+ }
+
+ // 寮�鍗″悓姝ュ厖鍊兼椂鍏佽鍗＄墖涓烘棤鏁堢姸鎬侊紝寰楀埌閫氱煡鍚庤嚜鍔ㄥ彉鏇翠负鏈夋晥
+ if (!remarks.trim().equals("鍏呭��") && !stateName.equals("姝ｅ父") && !stateName.equals("鏃犳晥鍗＄墖")) {
return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -188,39 +214,27 @@
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
- if(map == null || map.size() <= 0) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
clientId = Long.parseLong(map.get("clientId").toString());
/**
- * 淇敼鍐滄埛鍗′俊鎭細
- * 琛ュ崱鏃堕棿
- * 鏈�鍚庢搷浣滅被鍨�-2
+ * 鍏呭�兼椂涓嶄慨鏀瑰啘鎴峰崱淇℃伅锛屾敹鍒版垚鍔熼�氱煡鍚庡啀淇敼锛氫綑棰濄�佸厖鍊兼椂闂淬�佹渶鍚庢搷浣滅被鍨�
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setMoney(afterRecharge);
+ seClientCard.setRechargedt(rechargeTime);
+ 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());
+ }
*/
- // 鏍规嵁鏀粯鏂瑰紡ID鑾峰彇鏀粯鏂瑰紡鍚嶇О
- SePaymentMethod sePaymentMethod = sePaymentMethodMapper.selectByPrimaryKey(paymentId);
- String paymentName = sePaymentMethod.getName();
-
- SeClientCard seClientCard = new SeClientCard();
- 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 ());
- //}
- 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);
@@ -228,21 +242,16 @@
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());
- //}
seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
seCardOperate.setPaymentId(paymentId);
seCardOperate.setPrice(price);
seCardOperate.setRemarks(remarks);
seCardOperate.setOperator(operator);
seCardOperate.setOperateDt(rechargeTime);
-
+ seCardOperate.setOperateValid((byte) 1);
seCardOperateMapper.insert(seCardOperate);
Long rec = Optional.ofNullable(seCardOperate.getId()).orElse(0L);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
}
@@ -261,9 +270,10 @@
seRechargeHistory.setRemarks(remarks);
seRechargeHistory.setOperator(operator);
seRechargeHistory.setOperatedt(rechargeTime);
+ seRechargeHistory.setOperateValid((byte) 1);
seRechargeHistoryMapper.insert(seRechargeHistory);
Long rec_seRechargeHistory = Optional.ofNullable(seRechargeHistory.getId()).orElse(0L);
- if(rec_seRechargeHistory == 0) {
+ if (rec_seRechargeHistory == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_HISTORY_ERROR.getMessage());
}
@@ -271,11 +281,12 @@
map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
- return BaseResponseUtils.buildSuccess(map_response) ;
+ return BaseResponseUtils.buildSuccess(map_response);
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�
+ *
* @param queryVo
* @return
*/
@@ -296,49 +307,168 @@
Long itemTotal = seCardOperateMapper.getRecordCount(params);
- QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCardOperateMapper.getRecharges(params);
- return rsVo ;
+ return rsVo;
+ }
+
+ /**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�
+ *
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoRechargeNew>> getRechargesNew(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seCardOperateMapper.getRechargesCountNew(params);
+
+ QueryResultVo<List<VoRechargeNew>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seCardOperateMapper.getRechargesNew(params);
+ return rsVo;
+ }
+
+ /**
+ * 鑾峰彇杩旇繕璁板綍锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�
+ *
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoRefund>> getRefunds(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seCardOperateMapper.getRefundsCount(params);
+
+ QueryResultVo<List<VoRefund>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seCardOperateMapper.getRefunds(params);
+ return rsVo;
+ }
+
+ /**
+ * 鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�
+ *
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoExpend>> getExpends(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = rmOpenCloseValveHistoryMapper.getExpendsCount(params);
+
+ QueryResultVo<List<VoExpend>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOpenCloseValveHistoryMapper.getExpends(params);
+ return rsVo;
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍
+ *
* @param vo
* @return
*/
- public Map getTransactions(QoTransaction vo){
+ public Map getTransactions(QoTransaction vo) {
DecimalFormat df = new DecimalFormat("0.00");
// 琛ラ綈鏌ヨ鏃堕棿
String operateTimeStart = vo.operateTimeStart;
String operateTimeStop = vo.operateTimeStop;
- if(operateTimeStart != null) {
+ if (operateTimeStart != null) {
operateTimeStart = operateTimeStart + " 00:00:00";
vo.setOperateTimeStart(operateTimeStart);
}
- if(operateTimeStop != null) {
+ if (operateTimeStop != null) {
operateTimeStop = operateTimeStop + " 23:59:59";
vo.setOperateTimeStop(operateTimeStop);
}
// 鐢熸垚鏌ヨ鍙傛暟
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L);
- QueryResultVo rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = vo.pageSize ;
- rsVo.pageCurr = vo.pageCurr ;
+ QueryResultVo<List<VoTradeDetails>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = vo.pageSize;
+ rsVo.pageCurr = vo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
- List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params);
- if(list.size() == 0) {
+ rsVo.obj = seCardOperateMapper.getTransactions(params);
+ List<VoTradeDetails> list = rsVo.obj;
+ if (list.size() == 0) {
return new HashMap();
}
+//鍏冭皨涓�鏈熼檰甯镐附闇�姹傛妸璧犻�侀噾棰濅笌鍏呭�奸噾棰濆垎寮�鏄剧ず
+ for (int i = list.size()-1; i >= 0 ; i--) {
+ Optional.ofNullable(list.get(i).getGift()).orElse(0d);
+ if (!list.get(i).getGift().equals(0d)){
+ Double gift1 = list.get(i).getGift();//璧犻�侀噾棰�
+ String districtTitle = list.get(i).getDistrictTitle();//鍦板潃
+ String clientNum = list.get(i).getClientNum();//鍐滄埛缂栧彿
+ String clientName = list.get(i).getClientName();//鍐滄埛濮撳悕
+ String phone = list.get(i).getPhone();//鎵嬫満鍙�
+ Date tradeTime = list.get(i).getTradeTime();//浜ゆ槗鏃堕棿
+ String orderNumber = list.get(i).getOrderNumber();//璁㈠崟缂栧彿
+ String cardNum = list.get(i).getCardNum();//鍗＄紪鍙�
+ String idCard = list.get(i).getIdCard();//韬唤璇�
+ String cashierName = list.get(i).getCashierName();//鎿嶄綔浜�
+ Double money = list.get(i).getMoney();//浣欓
+ Double cardCost1 = list.get(i).getCardCost();//璐崱閲戦
+ Double tradeAmount = list.get(i).getTradeAmount();//浜ゆ槗閲戦
+ Double waterCost1 = list.get(i).getWaterCost();//璐按閲戦
+ Double refundAmount1 = list.get(i).getRefundAmount();//杩斿洖閲戦
+ String paymentName = list.get(i).getPaymentName();//鏀粯鏂瑰紡
+ String operateType = list.get(i).getOperateType();//涓氬姟绫诲瀷
+ String cardState = list.get(i).getCardState();//鍗＄姸鎬�
+ Long villageId = list.get(i).getVillageId();//鏉慽d
+ Long cashierId = list.get(i).getCashierId();//鏀堕摱鍛榠d
+
+ list.get(i).setGift(0d);
+ list.get(i).setMoney(money-gift1);
+
+ VoTradeDetails voTradeDetail = new VoTradeDetails();
+ voTradeDetail.setDistrictTitle(districtTitle);//2
+ voTradeDetail.setClientNum(clientNum);//2
+ voTradeDetail.setClientName(clientName);//2
+ voTradeDetail.setPhone(phone);//2
+ voTradeDetail.setOperateType("璧犻��");//2
+ voTradeDetail.setTradeTime(tradeTime);//2
+ voTradeDetail.setWaterCost(0d);//2
+ voTradeDetail.setCardCost(0d);//2
+ voTradeDetail.setGift(gift1);//2
+ voTradeDetail.setTradeAmount(0d);//2
+ voTradeDetail.setRefundAmount(refundAmount1);//2
+ voTradeDetail.setMoney(money);//寰�2
+ voTradeDetail.setPaymentName("璧犻��");//2
+ voTradeDetail.setOrderNumber(orderNumber);//2
+ voTradeDetail.setCardNum(cardNum);//2
+ voTradeDetail.setIdCard(idCard);//2
+ voTradeDetail.setCashierName(cashierName);//2
+ voTradeDetail.setCashierId(cashierId);//2
+ voTradeDetail.setCardState(cardState);//2
+ voTradeDetail.setVillageId(villageId);//2
+
+ list.add(voTradeDetail);
+ itemTotal = itemTotal + 1;
+ }
+ }
+ list.sort(Comparator.comparing(VoTradeDetails::getTradeTime));
+ rsVo.obj = list;
+ rsVo.calculateAndSet(itemTotal, params);
// 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬昏喘姘撮噾棰濄�佽喘鍗￠噾棰�
Double totalWaterCost = 0.0;
@@ -346,8 +476,8 @@
Double totalGift = 0.0;
Double totalRefund = 0.0;
- JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
- for(int i = 0; i < array.size(); i++) {
+ JSONArray array = JSONArray.parseArray(JSON.toJSONString(list));
+ for (int i = 0; i < array.size(); i++) {
JSONObject job = array.getJSONObject(i);
Double waterCost = Optional.ofNullable(job.getDouble("waterCost")).orElse(0.0);
Double cardCost = Optional.ofNullable(job.getDouble("cardCost")).orElse(0.0);
@@ -361,15 +491,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);
@@ -378,6 +506,7 @@
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�
+ *
* @param queryVo
* @return
*/
@@ -385,11 +514,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String activeTimeStart = queryVo.activeTimeStart;
String activeTimeStop = queryVo.activeTimeStop;
- if(activeTimeStart != null) {
+ if (activeTimeStart != null) {
activeTimeStart = activeTimeStart + " 00:00:00";
queryVo.setActiveTimeStart(activeTimeStart);
}
- if(activeTimeStop != null) {
+ if (activeTimeStop != null) {
activeTimeStop = activeTimeStop + " 23:59:59";
queryVo.setActiveTimeStop(activeTimeStop);
}
@@ -398,18 +527,19 @@
Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params);
- QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCardOperateMapper.getActiveCards(params);
- return rsVo ;
+ return rsVo;
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇琛ュ崱璁板綍
+ *
* @param queryVo
* @return
*/
@@ -417,11 +547,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String reissueCardTimeStart = queryVo.reissueCardTimeStart;
String reissueCardTimeStop = queryVo.reissueCardTimeStop;
- if(reissueCardTimeStart != null) {
+ if (reissueCardTimeStart != null) {
reissueCardTimeStart = reissueCardTimeStart + " 00:00:00";
queryVo.setReissueCardTimeStart(reissueCardTimeStart);
}
- if(reissueCardTimeStop != null) {
+ if (reissueCardTimeStop != null) {
reissueCardTimeStop = reissueCardTimeStop + " 23:59:59";
queryVo.setReissueCardTimeStop(reissueCardTimeStop);
}
@@ -430,18 +560,19 @@
Long itemTotal = seCardOperateMapper.getReissueCardRecordCount(params);
- QueryResultVo<List<VoReissueCard>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoReissueCard>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCardOperateMapper.getReissueCards(params);
- return rsVo ;
+ return rsVo;
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍
+ *
* @param queryVo
* @return
*/
@@ -449,11 +580,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if(timeStart != null) {
+ if (timeStart != null) {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
}
- if(timeStop != null) {
+ if (timeStop != null) {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
@@ -462,22 +593,30 @@
Long itemTotal = Optional.ofNullable(seCardOperateMapper.getCommonOperationRecordCount(params)).orElse(0L);
- QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seCardOperateMapper.getCommonOperations(params);
- return rsVo ;
+ return rsVo;
}
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃
+ *
* @param queryVo
* @return
*/
public Map getReceipts(QoReceipt queryVo) {
+ if (queryVo.getTimeStart() != null && queryVo.getTimeStart() != "") {
+ queryVo.setTimeStart(queryVo.getTimeStart() + " 00:00:00");
+ }
+ if (queryVo.getTimeStop() != null && queryVo.getTimeStop() != "") {
+ queryVo.setTimeStop(queryVo.getTimeStop() + " 23:59:59");
+ }
+
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
DecimalFormat df = new DecimalFormat("#.00");
@@ -485,9 +624,9 @@
Long itemTotal = seCardOperateMapper.getReceiptsRecordCount(params);
- QueryResultVo<List<VoReceipt>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ QueryResultVo<List<VoReceipt>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
//rsVo.obj = seCardOperateMapper.getReceipts(params);
@@ -510,13 +649,14 @@
/**
* 鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰�
+ *
* @param cardNum 姘村崱缂栧彿
* @return 鏄惁宸叉寕澶辨湭琛ュ崱
*/
public Boolean isLostAndUnreplaced(Long cardNum) {
Integer lostCount = seClientCardMapper.getLostCount(cardNum);
Integer replacedCount = seClientCardMapper.getReplacedCount(cardNum);
- if(lostCount > 0 && replacedCount == 0) {
+ if (lostCount > 0 && replacedCount == 0) {
return true;
}
return false;
@@ -524,6 +664,7 @@
/**
* 淇敼鍐滄埛姘村崱
+ *
* @param po
* @return
*/
@@ -533,6 +674,7 @@
/**
* 鑾峰彇椤圭洰缂栧彿
+ *
* @return
*/
public String getProjectNo() {
@@ -541,6 +683,7 @@
/**
* 鏍规嵁姘村崱缂栧彿鑾峰彇鍏舵寕澶辨椂閫�娆鹃噾棰濓紙琛ュ崱鏃跺垽鏂娇鐢級
+ *
* @param cardNum
* @return
*/
@@ -550,23 +693,203 @@
/**
* 鏍规嵁姘村崱鍦板潃鍒ゆ柇璇ュ崱鏄惁鍙互寮�鍗�
+ *
* @param cardAddr
* @return
*/
public Boolean canActiveCard(String cardAddr) {
- // 鎸囧畾姘村崱鍦板潃鐨勬按鍗℃暟閲�
+ // 鎸囧畾姘村崱鍦板潃鐨勬按鍗℃暟閲忥紝鏃犳晥鍗＄墖鎺掗櫎鍦ㄥ
Long cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddr(cardAddr)).orElse(0L);
- if(cardCount == 0) {
- return true;
+ if (cardCount == 0) {
+ return true;
}
// 鎸囧畾姘村崱鍦板潃涓旀甯哥姸鎬佹垨鎸傚け鐘舵�佺殑姘村崱鏁伴噺
cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddrAndState(cardAddr)).orElse(0L);
- if(cardCount == 0) {
+ if (cardCount == 0) {
return true;
}
return false;
}
+
+ /**
+ * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿
+ *
+ * @param cardAddr
+ * @return
+ */
+ public Long getCardIdByAddr(String cardAddr) {
+ return seClientCardMapper.getCardIdByAddr(cardAddr);
+ }
+
+ /**
+ * 渚濇嵁姘村崱鍦板潃灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鎸囧畾鎿嶄綔璁板綍鏀逛负鏈夋晥
+ *
+ * @param cardAddr
+ * @param operateType
+ * @return
+ */
+ public Integer turnCardValidByAddr(String cardAddr, Integer operateType) {
+ return seClientCardMapper.turnCardValidByAddr(cardAddr, operateType);
+ }
+
+ /**
+ * 鏍规嵁姘村崱ID銆佹搷浣滅被鍨嬭幏鍙栬幏鍙栨渶鍚庝竴鏉¤褰曪紝鍒ゆ柇寮�鍗℃槸鍚﹀悓姝ュ厖鍊间娇鐢�
+ *
+ * @param cardId
+ * @return
+ */
+ public Integer turnOperateValidByCardId(Long cardId, Integer operateType) {
+ return seCardOperateMapper.turnOperateValidByCardId(cardId, operateType);
+ }
+
+ /**
+ * 渚濇嵁姘村崱ID灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鍏呭�煎巻鍙茶褰曟敼涓烘湁鏁�
+ *
+ * @param cardId
+ * @return
+ */
+ public Integer turnRechargeHistoryValidByCardId(Long cardId) {
+ return seRechargeHistoryMapper.turnRechargeHistoryValidByCardId(cardId);
+ }
+
+ /**
+ * 鏍规嵁姘村崱ID鍒ゆ柇鏄惁涓哄紑鍗℃椂鍚屾鍏呭��
+ * 璇ユ按鍗D涓嶅瓨鍦ㄥ紑鍗¤褰曟垨鍏呭�艰褰曞垯杩斿洖false
+ * 濡傛灉寮�鍗℃搷浣滀笌鍏呭�兼搷浣滄椂闂撮棿闅旇秴杩�30绉掑垯杩斿洖false
+ * 濡傛灉鍏呭�奸噾棰濆ぇ浜�0涓斿厖鍊煎墠浣欓涓�0鍒欒繑鍥瀟rue
+ *
+ * @param cardId
+ * @return
+ */
+ public Boolean isMergeRecharge(Long cardId) {
+ SeCardOperate activeCard = seCardOperateMapper.getCardOperate(1, cardId);
+ SeCardOperate recharge = seCardOperateMapper.getCardOperate(2, cardId);
+ if (activeCard == null || recharge == null) {
+ return false;
+ }
+
+ Duration duration = Duration.between(activeCard.getOperateDt().toInstant(), recharge.getOperateDt().toInstant());
+ if (duration.toSeconds() > 30) {
+ return false;
+ }
+
+ Float money = Optional.ofNullable(recharge.getMoney()).orElse(0f);
+ Float tradeAmount = Optional.ofNullable(recharge.getTradeAmount()).orElse(0f);
+
+ if (tradeAmount > 0 && money == 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 鏍规嵁姘村崱ID浠庢搷浣滆褰曡〃涓彇鍑猴細浣欓銆佷氦鏄撻噾棰濄�佽禒閫侀噾棰濓紝姹傚拰寰楀埌姘村崱浣欓
+ * 灏嗕綑棰濇洿鏂板埌姘村崱琛ㄤ腑
+ *
+ * @param cardId
+ * @return
+ */
+ public Boolean updateCard(Long cardId) {
+ SeCardOperate recharge = seCardOperateMapper.getCardOperate(2, cardId);
+ if (recharge == null) {
+ return false;
+ }
+ Float money = Optional.ofNullable(recharge.getMoney()).orElse(0f);
+ Float amount = Optional.ofNullable(recharge.getTradeAmount()).orElse(0f);
+ Float gift = Optional.ofNullable(recharge.getGift()).orElse(0f);
+
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setMoney(money + amount + gift);
+ clientCard.setRechargedt(recharge.getOperateDt());
+ clientCard.setLastoper(LastOperateENUM.RECHARGE.getCode());
+ Integer rec_updateClientCard = seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ if (rec_updateClientCard == null || rec_updateClientCard == 0) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 濡傛灉琛ュ崱鏃惰浆绉讳簡閫�杩橀噾棰濓紝娓呯┖鎸傚け鍗′綑棰�
+ * @param operateType
+ * @param cardId
+ */
+ public void emptyCardBalance(Integer operateType, Long cardId) {
+ SeCardOperate cardOperate = seCardOperateMapper.getCardOperate(operateType, cardId);
+ if(cardOperate != null) {
+ Float noTradeAmount = cardOperate.getNoTradeAmount();
+ if(noTradeAmount != null && noTradeAmount > 0) {
+ Long originalCardId = seClientCardMapper.getOriginalCardIdByCardId(cardId);
+ if(originalCardId != null) {
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setMoney(0f);
+ seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 淇敼娉ㄩ攢姘村崱琛ㄧ殑璁板綍鍙婁綑棰濓紙0锛�
+ * @param cardId
+ * @return
+ */
+ public Integer updateCancels(Integer operateType, Long cardId) {
+ SeCardOperate cardOperate = seCardOperateMapper.getCardOperate(operateType, cardId);
+ Date cancelTime = Optional.ofNullable(cardOperate.getOperateDt()).orElse(new Date());
+
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setCanceldt(cancelTime);
+ clientCard.setMoney(0f);
+ clientCard.setState(CardStateENUM.CANCELLED.getCode());
+ clientCard.setLastoper(LastOperateENUM.CANCEL.getCode());
+ return seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ }
+
+ /**
+ * 淇敼琛ユ墸姘村崱琛ㄧ殑鎿嶄綔淇℃伅鍙婁綑棰�
+ * @param operateType
+ * @param cardId
+ * @return
+ */
+ public Integer updateRefund(Integer operateType, Long cardId) {
+ SeCardOperate cardOperate = seCardOperateMapper.getCardOperate(operateType, cardId);
+ Date refundTime = Optional.ofNullable(cardOperate.getOperateDt()).orElse(new Date());
+ Float money = cardOperate.getMoney();
+ Float refund = cardOperate.getRefundAmount();
+
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setRefunddt(refundTime);
+ clientCard.setMoney(money + refund);
+ clientCard.setLastoper(LastOperateENUM.REFUND.getCode());
+ return seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ }
+
+ /**
+ * 淇敼鍙嶅啓姘村崱琛ㄧ殑鎿嶄綔淇℃伅鍙婁綑棰�
+ * @param operateType
+ * @param cardId
+ * @return
+ */
+ public Integer updateWriteBack(Integer operateType, Long cardId) {
+ SeCardOperate cardOperate = seCardOperateMapper.getCardOperate(operateType, cardId);
+ Date writeBackTime = Optional.ofNullable(cardOperate.getOperateDt()).orElse(new Date());
+ Float money = cardOperate.getMoney();
+
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setRefunddt(writeBackTime);
+ clientCard.setMoney(money);
+ clientCard.setLastoper(LastOperateENUM.WRITE_BACK.getCode());
+ return seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ }
}
--
Gitblit v1.8.0