From 128d76344bb647c8df454f89af63e9a8c0187057 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 18 十月 2023 19:03:27 +0800
Subject: [PATCH] update
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 1
cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java | 6 +-
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 3 +
cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js | 4
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 18 ++++++
cloud-server-other/src/main/java/com/dsh/other/mapper/TGameMapper.java | 5 +
cloud-server-other/src/main/java/com/dsh/other/service/TGameService.java | 7 ++
cloud-server-other/src/main/resources/mapper/TGameMapper.xml | 3 +
cloud-server-other/src/main/java/com/dsh/other/service/impl/TGameServiceImpl.java | 4 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 12 ++-
cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js | 4 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html | 2
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 66 +++++++++++++++++----
13 files changed, 107 insertions(+), 28 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index d1ddfae..3809cb0 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -163,6 +163,9 @@
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("deductionAmount");
+ if(num1==null){
+ num1=0d;
+ }
if(price.compareTo(num1) <= 0){
continue;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index d6c2200..336cc52 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.domain.Person;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -675,17 +676,18 @@
if(coursePackagePayment.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
+
+ if(coursePackagePayment.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+// Map<String, String> data1 = resultUtil.getData();
+ String s = alipayTradeQueryResponse.getTradeStatus();
+ String tradeNo = alipayTradeQueryResponse.getTradeNo();
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
coursePackagePayment.setState(3);
baseMapper1.deleteById(coursePackagePayment.getId());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 77735e7..c837017 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -9,7 +9,10 @@
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.*;
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
+import com.alipay.api.response.AlipayTradeQueryResponse;
+import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -944,17 +947,17 @@
if(one.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && one.getPayStatus() == 1){
+ AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
+ if( one.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+ String s = alipayTradeQueryResponse.getTradeStatus();
+
+ String tradeNo = alipayTradeQueryResponse.getTradeNo();
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setStatus(3);
@@ -966,6 +969,7 @@
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(tradeNo);
+ coursePackagePayment.setAppUserId(null);
}
coursePackagePaymentService.updateBatchById(list);
System.out.println("===========到达支付");
@@ -1012,23 +1016,56 @@
model.setOutRequestNo(outNum);
model.setTradeNo(tradeNo);
List<RoyaltyDetailInfos> royaltyDetailInfos = new ArrayList<>();
+//
+
+ AlipayTradeRoyaltyRelationBindRequest request1 = new AlipayTradeRoyaltyRelationBindRequest();
- RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
- royaltyDetailInfos1.setTransOutType("userId");
- royaltyDetailInfos1.setTransOut("2021004105665036");
- royaltyDetailInfos1.setTransInType("loginName");
- royaltyDetailInfos1.setTransIn("18398968484");
- royaltyDetailInfos1.setAmount("0.1");
+ request1.setBizContent("{" +
+ " \"receiver_list\":[" +
+ " {" +
+ " \"type\":\"loginName\"," +
+ " \"account\":\"19522115070\"," +
+ " \"name\":\"罗易胜\"," +
+ " \"memo\":\"分账给测试商户\"," +
+ " }" +
+ " ]," +
+ " \"out_request_no\":\""+tradeNo+"\"" +
+ "}");
+ AlipayTradeRoyaltyRelationBindResponse response = alipayClient.execute(request1);
+ if(response.isSuccess()){
+ System.out.println("绑定调用成功");
+ } else {
+ System.out.println("调用失败");
+ }
- royaltyDetailInfos.add(royaltyDetailInfos1);
+
+// RoyaltyDetailInfos royaltyDetailInfos1 = new RoyaltyDetailInfos();
+// royaltyDetailInfos1.setTransOutType("loginName");
+// royaltyDetailInfos1.setTransOut("happysports@weparklife.com");
+// royaltyDetailInfos1.setTransInType("loginName");
+// royaltyDetailInfos1.setTransIn("19522115070");
+//// royaltyDetailInfos1.setAmount("0.01");
+// royaltyDetailInfos1.setAmountPercentage("100");
+
+// royaltyDetailInfos.add(royaltyDetailInfos1);
+ OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
+ op.setTransOutType("loginName");
+ op.setTransOut("happysports@weparklife.com");
+ op.setTransInType("loginName");
+ op.setTransIn("19522115070");
+ op.setAmountPercentage(100L);
+
+ List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
+ ops.add(op);
+ model.setRoyaltyParameters(ops);
request.setBizModel(model);
- AlipayTradeOrderSettleResponse response = alipayClient.execute(request);
- if(response.isSuccess()){
+ AlipayTradeOrderSettleResponse response1 = alipayClient.execute(request);
+ if(response1.isSuccess()){
System.out.println("调用成功");
} else {
System.out.println("调用失败");
@@ -1037,6 +1074,7 @@
+
/**
* 玩湃币支付课程
* @param appUser
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
index 3e33721..839bdc2 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
@@ -257,7 +257,7 @@
* @return
* @throws Exception
*/
- public ResultUtil queryALIOrder(String out_trade_no) throws Exception{
+ public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception{
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",aliAppid, appPrivateKey,"json","UTF-8",alipay_public_key,"RSA2");
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
request.setBizContent("{" +
@@ -266,9 +266,9 @@
AlipayTradeQueryResponse response = alipayClient.execute(request);
if(response.isSuccess()){
String tradeStatus = response.getTradeStatus();//交易状态：WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
- return ResultUtil.success(tradeStatus);
+ return response;
} else {
- return ResultUtil.error(response.getMsg());
+ return response;
}
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
index 137f39d..19e7605 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
@@ -102,6 +102,7 @@
<select style="width: 300px" class="form-control" id="range1" name="range1" onchange="getStoreByCity(this)">
<option value="y">年度</option>
<option value="m">月度</option>
+ <option value="d">日度</option>
</select>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html
index 78d091a..3e80306 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html
@@ -30,7 +30,7 @@
$(function(){
var ajax = new $ax(Feng.ctxPath + "/gateData/totalNum", function(data){
var totalNumber= document.getElementById("totalNumber");
- totalNumber.innerText = "场地总人次:" + data +"次";
+ totalNumber.innerText = "场地总人次： " + data +"次";
});
ajax.start();
});
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js b/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
index d75a660..6d5faf7 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
@@ -13,13 +13,11 @@
*/
TSite.initColumn = function () {
return [
- {field: 'selectItem', radio: true},
- {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {field: 'selectItem', radio: false},
{title: '场地区域名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '入场人次', field: 'enter_num', visible: true, align: 'center', valign: 'middle'}
];
};
-
/**
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index 99ce781..f7e89af 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -42,9 +42,9 @@
},
{title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle'
},
- {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
+ {title: '已领数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
},
- {title: '已兑换数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle'
+ {title: '已兑换数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle'
},
{title: '排序', field: 'sort', visible: true, align: 'center', valign: 'middle'},
{title: '活动状态', field: 'activeStatus', visible: true, align: 'center', valign: 'middle',
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index 2e1e376..9ff7dbf 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -51,6 +51,24 @@
private PayMoneyUtil payMoneyUtil;
+
+ @ResponseBody
+ @PostMapping("/getIntro")
+ @ApiOperation(value = "获取步骤说明", tags = {"用户—游戏"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<String> getIntro(){
+ try {
+
+ return ResultUtil.success( gameService.getIntro());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@PostMapping("/queryGameList")
@ApiOperation(value = "获取当前场地的游戏列表配置", tags = {"用户—游戏"})
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/TGameMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/TGameMapper.java
index a5a826e..2006867 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/TGameMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/TGameMapper.java
@@ -13,4 +13,9 @@
*/
public interface TGameMapper extends BaseMapper<TGame> {
+ String getIntro();
+
+
+
+
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/TGameService.java b/cloud-server-other/src/main/java/com/dsh/other/service/TGameService.java
index 5918b0e..8f4bb0e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/TGameService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/TGameService.java
@@ -14,4 +14,11 @@
*/
public interface TGameService extends IService<TGame> {
+ String getIntro();
+
+
+
+
+
+
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/TGameServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TGameServiceImpl.java
index b6d0958..9c94812 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/TGameServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/TGameServiceImpl.java
@@ -17,4 +17,8 @@
@Service
public class TGameServiceImpl extends ServiceImpl<TGameMapper, TGame> implements TGameService {
+ @Override
+ public String getIntro() {
+ return this.baseMapper.getIntro();
+ }
}
diff --git a/cloud-server-other/src/main/resources/mapper/TGameMapper.xml b/cloud-server-other/src/main/resources/mapper/TGameMapper.xml
index 47e73cb..515ad3e 100644
--- a/cloud-server-other/src/main/resources/mapper/TGameMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/TGameMapper.xml
@@ -3,4 +3,7 @@
<mapper namespace="com.dsh.other.mapper.TGameMapper">
+ <select id="getIntro" resultType="java.lang.String">
+ select jieshao from t_js where id =100
+ </select>
</mapper>
--
Gitblit v1.7.1