From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期一, 22 四月 2024 10:52:29 +0800 Subject: [PATCH] Merge branch 'master2' --- src/main/java/com/boying/controller/phone/YCPayController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java index c556217..9f54dde 100644 --- a/src/main/java/com/boying/controller/phone/YCPayController.java +++ b/src/main/java/com/boying/controller/phone/YCPayController.java @@ -13,6 +13,8 @@ import com.boying.service.*; import com.boying.util.DateUtilOther; import com.google.gson.Gson; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.http.ResponseEntity; @@ -46,6 +48,7 @@ @RestController @RequestMapping("/ffzf/api") @RequiredArgsConstructor +@Tag(description = "ffzf/api" , name = "閭偍/閭㈠彴閾惰 瀵规帴鏀粯鎺ュ彛" ) public class YCPayController { private final OutParkService outParkService; private final PayLogService payLogService; @@ -68,6 +71,7 @@ * @return */ @GetMapping("/getByQueryId") + @Operation(summary = "鏍规嵁鍑哄満id鑾峰彇鍑哄満鏁版嵁" , description = "鏍规嵁鍑哄満id鑾峰彇鍑哄満鏁版嵁" ) public Object getByQueryId(Long queryId){ if(queryId == null){ return R.failed("鍙傛暟涓虹┖"); @@ -83,6 +87,7 @@ * 缂存涔� */ @PostMapping("park") + @Operation(summary = "閭偍鐢宠缂存涔�" , description = "閭偍鐢宠缂存涔�" ) public Object park(Long id){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss"); OutPark outPark = outParkService.getById(id); @@ -152,6 +157,7 @@ * @return */ @PostMapping("parkJudg") + @Operation(summary = "鍒ゆ柇鏀粯绔槸鍚﹀凡缁忕敵璇疯繃鏀粯" , description = "鍒ゆ柇鏀粯绔槸鍚﹀凡缁忕敵璇疯繃鏀粯" ) public Object parkJudg(Long id){ if(id == null){ return R.failed("鏈壘鍒版暟鎹紝璇风◢鍚庨噸鏂扮偣鍑�"); @@ -182,6 +188,7 @@ * 鍒ゆ柇鏄惁缂磋垂 */ @PostMapping("parkXT") + @Operation(summary = "閭㈠彴閾惰鐢宠缂磋垂" , description = "閭㈠彴閾惰鐢宠缂磋垂" ) public Object parkXT(Long id){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss"); OutPark outPark = outParkService.getById(id); @@ -256,6 +263,7 @@ * 闃块噷缂磋垂 */ @PostMapping("payByAli") + @Operation(summary = "閭㈠彴閾惰鏀粯瀹濈即璐�" , description = "閭㈠彴閾惰鏀粯瀹濈即璐�" ) public Object payByAli(Long id){ OutPark outPark = outParkService.getById(id); String xtyhpay = systemConfigProperties.getXTYHPAY(); @@ -331,6 +339,7 @@ * 鑾峰彇寰俊openid */ @PostMapping("getOpenId") + @Operation(summary = "閭㈠彴閾惰鑾峰彇寰俊鐢ㄦ埛openid" , description = "閭㈠彴閾惰鑾峰彇寰俊鐢ㄦ埛openid" ) public Object park(Long id,String code){ OutPark outPark = outParkService.getById(id); String openIdByCode = wxService.getOpenIdByCode(code); @@ -342,6 +351,7 @@ * 寰俊缂磋垂 */ @PostMapping("payByWX") + @Operation(summary = "閭㈠彴閾惰寰俊鏀粯" , description = "閭㈠彴閾惰寰俊鏀粯" ) public Object payByWX(Long id,String openId){ System.out.println("寮�濮嬫敮浠�"); OutPark outPark = outParkService.getById(id); @@ -434,6 +444,7 @@ * @return */ @GetMapping("/result") + @Operation(summary = "閭偍鑾峰緱鏀粯鍥炶皟" , description = "閭偍鑾峰緱鏀粯鍥炶皟" ) public Object result(Long queryId,int success,int msg){ OutPark byId = outParkService.getById(queryId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss"); @@ -468,6 +479,7 @@ * @return */ @PostMapping("/getResult") + @Operation(summary = "閭㈠彴閾惰鏀粯鍥炶皟鎺ュ彛" , description = "閭㈠彴閾惰鏀粯鍥炶皟鎺ュ彛" ) public Object getResult(HttpServletRequest request){ System.out.println("getResult鏀跺埌璁块棶"); String respCode = request.getParameter("respCode"); @@ -522,6 +534,7 @@ * @return */ @PostMapping ("/checkbill") + @Operation(summary = "閭偍瀵硅处鎺ュ彛" , description = "閭偍瀵硅处鎺ュ彛" ) public Object checkbill(@RequestBody Map params){ String checkDate = (String) params.get("checkDate"); String tranDate = (String) params.get("tranDate"); @@ -543,6 +556,7 @@ * @return */ @PostMapping ("/checkbillXTYH") + @Operation(summary = "閭㈠彴閾惰瀵硅处鎺ュ彛" , description = "閭㈠彴閾惰瀵硅处鎺ュ彛" ) public Object checkbillXTYH(String date){ String xtyhpay = systemConfigProperties.getXTYHPAY(); Map<String,Object> map = new HashMap<>(); @@ -587,6 +601,7 @@ * @return */ @PostMapping ("/searchPayStatus") + @Operation(summary = "浜ゆ槗鐘舵�佹煡璇�" , description = "浜ゆ槗鐘舵�佹煡璇�" ) public Object searchPayStatus(String txnOrderId,String txnOrderTime){ OutPark outPark = outParkService.findByOrderId(txnOrderId); if(outPark == null){ -- Gitblit v1.9.1