From 3447c6321d90416d86bd6bd6515589bae3911c65 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 31 一月 2024 15:36:52 +0800
Subject: [PATCH] 2024-01-31 朱宝民 电子钱包账户消费接口、申请退款接口、审核退款申请接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java | 211 +++++++++++++++++++++++++++++++++--
/dev/null | 36 ------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java | 11 +
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/RefundStatusENUM.java | 21 +++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/LastOperateENUM.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRefundMapper.java | 8 +
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRefundMapper.xml | 8 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeConsume.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletSv.java | 54 ++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java | 2
11 files changed, 300 insertions(+), 60 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRefundMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRefundMapper.java
index e8df533..729ed2d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRefundMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeRefundMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeRefund;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* @author ZhuBaoMin
@@ -24,4 +25,11 @@
int updateByPrimaryKeySelective(SeRefund record);
int updateByPrimaryKey(SeRefund record);
+
+ /**
+ * 鏍规嵁閽卞寘ID鑾峰彇寰呭鏍哥殑閫�娆剧敵璇峰璞�
+ * @param walletId
+ * @return
+ */
+ SeRefund getRefundByWallerId(@Param("walletId") Long walletId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeConsume.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeConsume.java
index fe5908d..de233af 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeConsume.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeConsume.java
@@ -42,7 +42,7 @@
* 閽卞寘ID
*/
@Schema(description = "閽卞寘ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
+ //@NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
private Long walletId;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
index 75f3c85..6ed10fb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
@@ -45,7 +45,6 @@
* 閽卞寘ID
*/
@Schema(description = "閽卞寘ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
private Long walletId;
/**
@@ -67,7 +66,7 @@
*/
@Schema(description = "閫�娆鹃噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Min(value = 0, message = "娑堥��娆鹃噾棰濅笉鑳藉皬浜�0")
- @NotNull(message = "閫�娆鹃噾棰濅笉鑳戒负绌�")
+ //@NotNull(message = "閫�娆鹃噾棰濅笉鑳戒负绌�")
private Double refundAmount;
/**
@@ -108,6 +107,6 @@
* 瀹℃牳澶囨敞
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 0, max = 200)
private String remarks;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
index 2b28652..c22ad9f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
@@ -42,7 +42,7 @@
* 閽卞寘ID
*/
@Schema(description = "閽卞寘ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
+ //@NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
private Long walletId;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRefundMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRefundMapper.xml
index d19093c..9576315 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRefundMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRefundMapper.xml
@@ -170,4 +170,12 @@
remarks = #{remarks,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁閽卞寘ID鑾峰彇寰呭鏍哥殑閫�娆剧敵璇峰璞�-->
+ <select id="getRefundByWallerId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from se_refund
+ where refund_status = 1 AND wallet_id = ${walletId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
index 8716054..f61de07 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
@@ -81,8 +81,15 @@
CLIENT_ID_CANNOT_BE_NULL(90001, "鍐滄埛缂栧彿涓嶈兘涓虹┖"),
WALLET_OPEN_ACCOUNT_FAIL(90002, "鐢靛瓙閽卞寘璐︽埛娉ㄥ唽澶辫触"),
WALLET_ACCOUNT_EXIST(90003, "璇ュ啘鎴峰凡娉ㄥ唽鐢靛瓙閽卞寘"),
- NO_ACCOUNT(90005, "鎮ㄥ皻鏈敞鍐岀數瀛愰挶鍖呰处鎴�"),
- UPDATE_ACCOUNT_FAIL(90006, "鍏呭�煎け璐ワ紝鐢靛瓙閽卞寘璐︽埛鏇存柊澶辫触");
+ NO_ACCOUNT(90004, "鎮ㄥ皻鏈敞鍐岀數瀛愰挶鍖呰处鎴�"),
+ UPDATE_ACCOUNT_FAIL(90005, "鍏呭�煎け璐ワ紝鐢靛瓙閽卞寘璐︽埛鏇存柊澶辫触"),
+ RECHARGE_FAIL(90006, "鍏呭�煎け璐�"),
+ BALANCE_IS_INSUFFICIENT(90007, "娑堣垂澶辫触锛屼綑棰濅笉瓒�"),
+ CONSUME_FAIL(90008, "娑堣垂澶辫触"),
+ REFUND_AMOUNT_CANNOT_GREATER_THAN_MONEY(90009, "鐢宠閫�娆惧け璐ワ紝閫�娆鹃噾棰濅笉鑳藉ぇ浜庝綑棰�"),
+ APPLICATION_REFUND_FAIL(900010, "鐢宠閫�娆惧け璐�"),
+ NO_TO_AUDIT_REFUND(900011, "璇ョ數瀛愰挶鍖呮病鏈夊緟瀹℃牳鐨勯��娆剧敵璇�"),
+ AUDIT_REFUND_FAIL(900012, "瀹℃牳閫�娆剧敵璇峰け璐�");
private final Integer code;
private final String message;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWallet.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWallet.java
deleted file mode 100644
index 6fbce4d..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWallet.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dy.pipIrrSell.wallet;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-
-/**
- * @author ZhuBaoMin
- * @date 2023/12/11 17:28
- * @LastEditTime 2023/12/11 17:28
- * @Description
- */
-
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "娉ㄥ唽鐢靛瓙閽卞寘浼犲叆瀵硅薄")
-public class DtoWallet {
- public static final long serialVersionUID = 1L;
-
- /**
- * 鍐滄埛缂栧彿
- */
- @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private Long clientId;
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWalletRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWalletRecharge.java
deleted file mode 100644
index 89c9e0a..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/DtoWalletRecharge.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dy.pipIrrSell.wallet;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-
-/**
- * @author ZhuBaoMin
- * @date 2023/12/12 11:46
- * @LastEditTime 2023/12/12 11:46
- * @Description
- */
-
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鐢靛瓙閽卞寘鍏呭�间紶鍏ュ璞�")
-public class DtoWalletRecharge {
- public static final long serialVersionUID = 1L;
-
- /**
- * 閽卞寘缂栧彿
- */
- @Schema(description = "閽卞寘缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "閽卞寘缂栧彿涓嶈兘涓虹┖")
- private Long walletId;
-
- /**
- * 鍐滄埛缂栧彿
- */
- @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private Long clientId;
-
- /**
- * 鍏呭�奸噾棰�
- */
- @Schema(description = "鍏呭�奸噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Min(value = 0, message="鍏呭�奸噾棰濅笉鑳藉皬浜�0")
- private Float amount;
-
- /**
- * 澶囨敞淇℃伅
- */
- @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private String remarks;
-}
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..780d2dd 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
@@ -4,10 +4,13 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
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.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 io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,6 +27,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.text.DecimalFormat;
import java.util.Date;
import java.util.Optional;
@@ -45,7 +49,7 @@
/**
* 娉ㄥ唽鐢靛瓙閽卞寘璐︽埛
- * 娉ㄥ唽閽卞厛楠岃瘉璇ュ啘鎴锋槸鍚﹀凡缁忔敞鍐岀數瀛愰挶鍖�
+ * 闇�瑕佽�冭檻宸叉敞鍐岃处鎴风殑鎯呭喌
* @param clientId
* @return
*/
@@ -84,6 +88,7 @@
/**
* 鐢靛瓙閽卞寘璐︽埛鍏呭��
+ * 闇�瑕佽�冭檻鏈敞鍐岃处鎴风殑鎯呭喌
* @param po
* @param bindingResult
* @return
@@ -100,7 +105,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 +130,200 @@
}
// 娣诲姞鍏呭�艰褰�
- 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) ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletSv.java
index 96f565e..56626f5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletSv.java
@@ -4,6 +4,8 @@
import com.dy.pipIrrGlobal.daoSe.SeRefundMapper;
import com.dy.pipIrrGlobal.daoSe.SeWalletMapper;
import com.dy.pipIrrGlobal.daoSe.SeWalletRechargeMapper;
+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 lombok.extern.slf4j.Slf4j;
@@ -51,10 +53,6 @@
return po.getId();
}
- public Integer updateWallet(SeWallet po) {
- return seWalletMapper.updateByPrimaryKeySelective(po);
- }
-
/**
* 鐢靛瓙閽卞寘鍏呭��
* @param po
@@ -65,4 +63,52 @@
return po.getId();
}
+ /**
+ * 鐢靛瓙閽卞寘娑堣垂
+ * @param po
+ * @return
+ */
+ public Long addConsume(SeConsume po) {
+ seConsumeMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 娣诲姞閫�娆剧敵璇�
+ * @param po
+ * @return
+ */
+ public Long addRefund(SeRefund po) {
+ seRefundMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 鏍规嵁閽卞寘ID鑾峰彇寰呭鏍哥殑閫�娆剧敵璇峰璞�
+ * @param walletId
+ * @return
+ */
+ public SeRefund getRefundByWallerId(Long walletId) {
+ return seRefundMapper.getRefundByWallerId(walletId);
+ }
+
+ /**
+ * 瀹℃牳閫�娆剧敵璇�
+ * @param po
+ * @return
+ */
+ public Integer auditRefund(SeRefund po) {
+ return seRefundMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 淇敼鐢靛瓙閽卞寘
+ * 鍏呭�笺�佹秷璐广�佺敵璇烽��娆俱�佸鏍搁��娆炬椂闇�瑕佷慨鏀圭數瀛愰挶鍖呯殑锛氫綑棰濄�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * @param po
+ * @return
+ */
+ public Integer updateWallet(SeWallet po) {
+ return seWalletMapper.updateByPrimaryKeySelective(po);
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/dto/DtoRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/dto/DtoRecharge.java
deleted file mode 100644
index c9953b2..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/dto/DtoRecharge.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dy.pipIrrSell.wallet.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-01-30 20:54
- * @LastEditTime 2024-01-30 20:54
- * @Description
- */
-
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鐢靛瓙閽卞寘璐︽埛鍏呭�间紶鍏ュ璞�")
-public class DtoRecharge {
- public static final long serialVersionUID = 202401302055001L;
-
- /**
- * 鍐滄埛ID
- */
- @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
- private Long clientId;
-
- /**
- * 鍏呭�奸噾棰�
- */
- @Schema(description = "鍏呭�奸噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鍏呭�奸噾棰濅笉鑳戒负绌�")
- private Double amount;
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/LastOperateENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/LastOperateENUM.java
similarity index 92%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/LastOperateENUM.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/LastOperateENUM.java
index c2e159f..cb5b1fd 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/LastOperateENUM.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/LastOperateENUM.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrSell.wallet;
+package com.dy.pipIrrSell.wallet.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/RefundStatusENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/RefundStatusENUM.java
new file mode 100644
index 0000000..a53e54e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/enums/RefundStatusENUM.java
@@ -0,0 +1,21 @@
+package com.dy.pipIrrSell.wallet.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-01-31 14:19
+ * @LastEditTime 2024-01-31 14:19
+ * @Description
+ */
+
+@Getter
+@AllArgsConstructor
+public enum RefundStatusENUM {
+ NO_REFUND((byte)1, "鏈��娆�"),
+ REFUNDED((byte)2, "宸查��娆�");
+
+ private final Byte code;
+ private final String message;
+}
--
Gitblit v1.8.0