From c6beb89b7170115eada78526f87406381c931229 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 四月 2025 10:37:51 +0800
Subject: [PATCH] 灌溉计划发布时仅发布灌溉时长大于0的
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 324 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
index 7383dc8..d70c88d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
@@ -3,11 +3,21 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.pojoSe.SeConsume;
+import com.dy.pipIrrGlobal.pojoSe.SeRefund;
import com.dy.pipIrrGlobal.pojoSe.SeWallet;
import com.dy.pipIrrGlobal.pojoSe.SeWalletRecharge;
+import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrGlobal.voSe.VoWallet;
+import com.dy.pipIrrGlobal.voSe.VoWalletRecharge;
+import com.dy.pipIrrGlobal.voSe.VoWalletRefund;
import com.dy.pipIrrSell.result.SellResultCode;
-import com.dy.pipIrrSell.wallet.dto.DtoRecharge;
+import com.dy.pipIrrSell.wallet.enums.LastOperateENUM;
+import com.dy.pipIrrSell.wallet.enums.RefundStatusENUM;
+import com.dy.pipIrrSell.wallet.qo.QoWalletRecharge;
+import com.dy.pipIrrSell.wallet.qo.QueryVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,8 +34,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-import java.util.Optional;
+import java.text.DecimalFormat;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -45,7 +55,7 @@
/**
* 娉ㄥ唽鐢靛瓙閽卞寘璐︽埛
- * 娉ㄥ唽閽卞厛楠岃瘉璇ュ啘鎴锋槸鍚﹀凡缁忔敞鍐岀數瀛愰挶鍖�
+ * 闇�瑕佽�冭檻宸叉敞鍐岃处鎴风殑鎯呭喌
* @param clientId
* @return
*/
@@ -66,7 +76,7 @@
}
if(walletSv.getWalletByClientId(clientId) != null) {
- return BaseResponseUtils.buildFail(SellResultCode.WALLET_ACCOUNT_EXIST.getMessage());
+ //return BaseResponseUtils.buildFail(SellResultCode.WALLET_ACCOUNT_EXIST.getMessage());
}
SeWallet seWallet = new SeWallet();
@@ -77,13 +87,14 @@
seWallet.setCreateTime(new Date());
Long rec = Optional.ofNullable(walletSv.addWallet(seWallet)).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.WALLET_OPEN_ACCOUNT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(SellResultCode.VC_OPEN_ACCOUNT_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
}
/**
* 鐢靛瓙閽卞寘璐︽埛鍏呭��
+ * 闇�瑕佽�冭檻鏈敞鍐岃处鎴风殑鎯呭喌
* @param po
* @param bindingResult
* @return
@@ -100,7 +111,7 @@
@PostMapping(path = "add_recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> addRecharge(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
+ public BaseResponse<Boolean> addRecharge(@RequestBody @Valid SeWalletRecharge po, BindingResult bindingResult){
Long clientId = Optional.ofNullable(po .getClientId()).orElse(0L);
Double amount = Optional.ofNullable(po.getAmount()).orElse(0.0);
@@ -125,18 +136,315 @@
}
// 娣诲姞鍏呭�艰褰�
- SeWalletRecharge seWalletRecharge = new SeWalletRecharge();
- seWalletRecharge.setWalletId(wallerId);
- seWalletRecharge.setClientId(clientId);
- seWalletRecharge.setMoney(money);
- seWalletRecharge.setAmount(amount);
- seWalletRecharge.setAfterRecharge(afterRrecharge);
- seWalletRecharge.setRechargeTime(new Date());
- Long rec = Optional.ofNullable(walletSv.addRecharge(seWalletRecharge)).orElse(0L);
+ po.setWalletId(wallerId);
+ po.setClientId(clientId);
+ po.setMoney(money);
+ po.setAmount(amount);
+ po.setAfterRecharge(afterRrecharge);
+ po.setRechargeTime(new Date());
+ Long rec = Optional.ofNullable(walletSv.addRecharge(po)).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.WALLET_OPEN_ACCOUNT_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
}
+ /**
+ * 鐢靛瓙閽卞寘娑堣垂
+ * 闇�瑕佽�冭檻鏈敞鍐岃处鎴风殑鎯呭喌銆佷綑棰濅笉瓒崇殑鎯呭喌
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "鐢靛瓙閽卞寘娑堣垂", description = "鐢靛瓙閽卞寘娑堣垂")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "add_consume", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> addConsume(@RequestBody @Valid SeConsume po, BindingResult bindingResult){
+ Long clientId = po .getClientId();
+ Double consumption = po.getConsumption();
+ Date vot = po.getVot();
+ Date vct = po.getVct();
+
+ // 璁＄畻寮�鍏抽榾鏃堕棿宸強鐢ㄦ按鏃堕暱
+ Long timeDifference = vct.getTime() - vot.getTime();
+ DecimalFormat df = new DecimalFormat("#.00");
+ Double duration = Double.parseDouble(df.format((float)timeDifference / (1000 * 60 * 60)));
+
+ // 楠岃瘉璇ュ啘鎴锋槸鍚﹀凡缁忔敞鍐岀數瀛愰挶鍖呰处鎴峰苟鍙栧嚭ID鍙婂綋鍓嶈处鎴蜂綑棰�
+ SeWallet seWallet = walletSv.getWalletByClientId(clientId);
+ if(seWallet == null) {
+ return BaseResponseUtils.buildFail(SellResultCode.NO_ACCOUNT.getMessage());
+ }
+ Long wallerId = Optional.ofNullable(seWallet.getId()).orElse(0L);
+ Double money = Optional.ofNullable(seWallet.getMoney()).orElse(0.0);
+
+ if(money < consumption) {
+ return BaseResponseUtils.buildFail(SellResultCode.BALANCE_IS_INSUFFICIENT.getMessage());
+ }
+ // 璁＄畻娑堣垂鍚庝綑棰�
+ Double afterConsume = money - consumption;
+
+ // 淇敼鐢靛瓙閽卞寘浣欓銆佹渶鍚庢搷浣滅被鍨嬨�佹渶鍚庢搷浣滄椂闂�
+ seWallet.setMoney(afterConsume);
+ seWallet.setLastOperate(LastOperateENUM.CONSUME.getCode());
+ seWallet.setLastOperateTime(new Date());
+ Integer rec_updateWaller = Optional.ofNullable(walletSv.updateWallet(seWallet)).orElse(0);
+ if(rec_updateWaller == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.UPDATE_ACCOUNT_FAIL.getMessage());
+ }
+
+ // 娣诲姞娑堣垂璁板綍
+ po.setWalletId(wallerId);
+ po.setMoney(money);
+ po.setAfterConsume(afterConsume);
+ po.setDuration(duration);
+ Long rec = Optional.ofNullable(walletSv.addConsume(po)).orElse(0L);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.CONSUME_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 鐢宠閫�娆�
+ * 闇�瑕佽�冭檻鐢宠閫�娆鹃噾棰濆ぇ浜庝綑棰濈殑鎯呭喌
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "鐢靛瓙閽卞寘鐢宠閫�璐�", description = "鐢靛瓙閽卞寘鐢宠閫�璐�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "add_refund", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> addRefund(@RequestBody @Valid SeRefund po, BindingResult bindingResult){
+ Long clientId = po .getClientId();
+ Double refundAmount = po.getRefundAmount();
+
+ // 楠岃瘉璇ュ啘鎴锋槸鍚﹀凡缁忔敞鍐岀數瀛愰挶鍖呰处鎴峰苟鍙栧嚭ID鍙婂綋鍓嶈处鎴蜂綑棰�
+ SeWallet seWallet = walletSv.getWalletByClientId(clientId);
+ if(seWallet == null) {
+ return BaseResponseUtils.buildFail(SellResultCode.NO_ACCOUNT.getMessage());
+ }
+ Long wallerId = Optional.ofNullable(seWallet.getId()).orElse(0L);
+ Double money = Optional.ofNullable(seWallet.getMoney()).orElse(0.0);
+
+ // 楠岃瘉閫�娆鹃噾棰濇槸鍚﹀ぇ浜庝綑棰�
+ if(money < refundAmount) {
+ return BaseResponseUtils.buildFail(SellResultCode.REFUND_AMOUNT_CANNOT_GREATER_THAN_MONEY.getMessage());
+ }
+ // 璁＄畻娑堣垂鍚庝綑棰�
+ Double afterRefund = money - refundAmount;
+
+ // 淇敼鐢靛瓙閽卞寘浣欓銆佹渶鍚庢搷浣滅被鍨嬨�佹渶鍚庢搷浣滄椂闂�
+ seWallet.setMoney(afterRefund);
+ seWallet.setLastOperate(LastOperateENUM.APPLY_REFUND.getCode());
+ seWallet.setLastOperateTime(new Date());
+ Integer rec_updateWaller = Optional.ofNullable(walletSv.updateWallet(seWallet)).orElse(0);
+ if(rec_updateWaller == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.UPDATE_ACCOUNT_FAIL.getMessage());
+ }
+
+ // 娣诲姞娑堣垂璁板綍
+ po.setWalletId(wallerId);
+ po.setMoney(money);
+ po.setAfterRefund(afterRefund);
+ po.setApplicationTime(new Date());
+ po.setRefundStatus(RefundStatusENUM.NO_REFUND.getCode());
+ Long rec = Optional.ofNullable(walletSv.addRefund(po)).orElse(0L);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.APPLICATION_REFUND_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 瀹℃牳閫�娆剧敵璇�
+ * 闇�瑕佽�冭檻璇ョ數瀛愰挶鍖呮病鏈夊緟瀹℃牳鐨勯��娆剧敵璇风殑鎯呭喌
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "鐢靛瓙閽卞寘瀹℃牳閫�娆剧敵璇�", description = "鐢靛瓙閽卞寘瀹℃牳閫�娆剧敵璇�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "audit_refund", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> auditRefund(@RequestBody @Valid SeRefund po, BindingResult bindingResult){
+ Long clientId = po.getClientId();
+ Byte refundStatus = po.getRefundStatus();
+ Long auditor = po.getAuditor();
+ String remarks = po.getRemarks();
+
+ // 楠岃瘉璇ュ啘鎴锋槸鍚﹀凡缁忔敞鍐岀數瀛愰挶鍖呰处鎴峰苟鍙栧嚭ID鍙婂綋鍓嶈处鎴蜂綑棰�
+ SeWallet seWallet = walletSv.getWalletByClientId(clientId);
+ if(seWallet == null) {
+ return BaseResponseUtils.buildFail(SellResultCode.NO_ACCOUNT.getMessage());
+ }
+ Long wallerId = Optional.ofNullable(seWallet.getId()).orElse(0L);
+ Double money = Optional.ofNullable(seWallet.getMoney()).orElse(0.0);
+
+ // 楠岃瘉璇ョ數瀛愰挶鍖呮槸鍚︽湁寰呭鏍哥殑閫�娆剧敵璇�(鏍规嵁閽卞寘ID鑾峰彇寰呭鏍哥殑閫�娆剧敵璇峰璞�)
+ SeRefund seRefund = walletSv.getRefundByWallerId(wallerId);
+ if(seRefund == null) {
+ return BaseResponseUtils.buildFail(SellResultCode.NO_TO_AUDIT_REFUND.getMessage());
+ }
+
+ // 淇敼鐢靛瓙閽卞寘鏈�鍚庢搷浣滅被鍨嬨�佹渶鍚庢搷浣滄椂闂�
+ seWallet.setLastOperate(LastOperateENUM.AUDIT_REFUND.getCode());
+ seWallet.setLastOperateTime(new Date());
+ Integer rec_updateWaller = Optional.ofNullable(walletSv.updateWallet(seWallet)).orElse(0);
+ if(rec_updateWaller == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.UPDATE_ACCOUNT_FAIL.getMessage());
+ }
+
+ // 娣诲姞娑堣垂璁板綍
+ seRefund.setRefundStatus(refundStatus);
+ seRefund.setAuditor(auditor);
+ seRefund.setAuditTime(new Date());
+ seRefund.setRemarks(remarks);
+ Integer rec = Optional.ofNullable(walletSv.auditRefund(seRefund)).orElse(0);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.AUDIT_REFUND_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍
+ * @param vo
+ * @return
+ */
+ @Operation(summary = "鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍", description = "杩斿洖鐢靛瓙閽卞寘璐︽埛璁板綍")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤佃ˉ鍗℃暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/get_wallets")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoWallet>>> getWallets(QueryVo vo){
+ try {
+ QueryResultVo<List<VoWallet>> res = walletSv.getWallets(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_ReissueCards.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰�
+ * @param vo
+ * @return
+ */
+ @Operation(summary = "鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰�", description = "杩斿洖鐢靛瓙閽卞寘鍏呭�艰褰�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤佃ˉ鍗℃暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/get_recharges")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoWalletRecharge>>> getWalletRecharges(QoWalletRecharge vo){
+ try {
+ QueryResultVo<List<VoWalletRecharge>> res = walletSv.getWalletRecharges(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_WALLER_RECHARGES.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ @Operation(summary = "鑾峰彇鐢靛瓙閽卞寘娑堣垂璁板綍", description = "杩斿洖鐢靛瓙閽卞寘娑堣垂璁板綍")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤佃ˉ鍗℃暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/get_consume")
+ @SsoAop()
+ public BaseResponse<Map> getWalletConsumes(QueryVo vo){
+ Long clientId = Optional.ofNullable(vo.getClientId()).orElse(0L);
+ if(clientId == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.WALLET_CLIENT_ID_CANNOT_BE_NULL.getMessage());
+ }
+ try {
+ Map res = Optional.ofNullable(walletSv.getWalletConsumes(vo)).orElse(new HashMap());
+ if(res.size() <= 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_WALLER_RECHARGES.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢靛瓙閽卞寘閫�娆捐褰�
+ * @param vo
+ * @return
+ */
+ @Operation(summary = "鑾峰彇鐢靛瓙閽卞寘閫�娆捐褰�", description = "杩斿洖鐢靛瓙閽卞寘閫�娆捐褰�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤佃ˉ鍗℃暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/get_refunds")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoWalletRefund>>> getWalletRefunds(QueryVo vo){
+ try {
+ QueryResultVo<List<VoWalletRefund>> res = walletSv.getWalletRefunds(vo);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.No_REFUNDS.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鐢靛瓙閽卞寘閫�娆捐褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
}
--
Gitblit v1.8.0