From 94aafe0f543196f9ea6c637b46a2d195125498c3 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 08 七月 2024 09:33:51 +0800
Subject: [PATCH] 2024-07-08 朱宝民 小程序远程开阀提供强制开阀功能

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
index 3114323..f79e599 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
@@ -13,7 +13,6 @@
 import com.dy.pipIrrSell.clientCard.LastOperateENUM;
 import com.dy.pipIrrSell.result.SellResultCode;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -47,9 +46,10 @@
                             schema = @Schema(implementation = VoRecharge.class))}
             )
     })
-    @GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @SsoAop("-1")
-    public BaseResponse<QueryResultVo<List<VoRecharge>>> get(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+    //@GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(path = "/getRecharges")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QueryVo vo){
         try {
             QueryResultVo<List<VoRecharge>> res = rechargeSv.getRecharges(vo);
             return BaseResponseUtils.buildSuccess(res);
@@ -70,8 +70,8 @@
     })
     @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
-    @SsoAop("-1")//@SsoAop(power = "-1")
-    public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoRecharge po, @Parameter(hidden = true) BindingResult bindingResult){
+    @SsoAop()
+    public BaseResponse<Boolean> add(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
@@ -99,8 +99,10 @@
          * rechargeTime     鍏呭�兼椂闂�
          */
         Long cardId = 0L;
-        String cardNum = po.getCardNum();
+        Long cardNum = po.getCardNum();
         String clientNum = "";
+        //Long clientId = po.getClientId();
+        Long clientId = 0L;
         Float money = po.getMoney();
         Float amount = po.getAmount();
         Float gift = po.getGift();
@@ -120,6 +122,7 @@
         }
         cardId = Long.parseLong(map.get("cardId").toString());
         clientNum = map.get("clientNum").toString();
+        clientId = Long.parseLong(map.get("clientId").toString());
 
         /**
          * 淇敼鍐滄埛鍗′俊鎭細
@@ -128,6 +131,7 @@
          */
         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);
@@ -138,13 +142,16 @@
         /**
          * 鍒犻櫎鍏呭�艰〃璇ュ崱鐨勫厖鍊艰褰�
          */
-        Integer rec_deleteRecharge = Optional.ofNullable(rechargeSv.deleteByCardNum(cardNum)).orElse(0);
+        Integer rec_deleteRecharge = Optional.ofNullable(rechargeSv.deleteByCardId(cardId)).orElse(0);
         /**
          * 娣诲姞鍏呭�艰褰�
          */
         SeRecharge seRecharge = new SeRecharge();
-        seRecharge.setCardnum(cardNum);
-        seRecharge.setClientnum(clientNum);
+        //seRecharge.setCardnum(cardNum);
+        //seRecharge.setClientnum(clientNum);
+
+        seRecharge.setCardid(cardId);
+        seRecharge.setClientid(clientId);
         seRecharge.setMoney(money);
         seRecharge.setAmount(amount);
         seRecharge.setGift(gift);
@@ -163,8 +170,10 @@
          * 娣诲姞琛ュ崱鍘嗗彶璁板綍
          */
         SeRechargeHistory seRechargeHistory = new SeRechargeHistory();
-        seRechargeHistory.setCardnum(cardNum);
-        seRechargeHistory.setClientnum(clientNum);
+        //seRechargeHistory.setCardnum(cardNum);
+        //seRechargeHistory.setClientnum(clientNum);
+        seRechargeHistory.setCardid(cardId);
+        seRechargeHistory.setClientid(clientId);
         seRechargeHistory.setMoney(money);
         seRechargeHistory.setAmount(amount);
         seRechargeHistory.setGift(gift);
@@ -179,7 +188,8 @@
         if(rec_history == 0) {
             return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_HISTORY_ERROR.getMessage());
         }
-
-        return BaseResponseUtils.buildSuccess(true) ;
+        Map returnMap = new HashMap();
+        returnMap.put("orderNumber",rec+"");//杩斿洖鍏呭�糏D
+        return BaseResponseUtils.buildSuccess(returnMap) ;
     }
 }

--
Gitblit v1.8.0