From 738f93e8f8226518e5b0e202b1f7afd19c01656e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 25 七月 2023 09:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 2 ++
cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java | 14 ++++++++++++--
/dev/null | 18 ------------------
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 1 +
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 6 +++---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 4 ++--
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 8 ++++----
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 2 +-
8 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index d757092..28f81fe 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -328,6 +328,7 @@
}
return istuService.renewClassPayment(userIdFormRedis,request);
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 84475b4..43313de 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -208,6 +208,7 @@
}
return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId));
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
}
@@ -248,6 +249,7 @@
}
return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java b/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
index 05d3117..4fe3686 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/RechargeRecords.java
@@ -1,6 +1,7 @@
package com.dsh.account.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -31,43 +32,52 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 流水号
*/
+ @TableField("code")
private String code;
/**
* 用户id
*/
+ @TableField("appUserId")
private Integer appUserId;
/**
* 充值金额
*/
+ @TableField("amount")
private BigDecimal amount;
/**
* 玩湃币
*/
+ @TableField("playPaiCoins")
private Integer playPaiCoins;
/**
* 支付状态（1=待支付，2=已支付）
*/
+ @TableField("payStatus")
private Integer payStatus;
/**
* 支付时间
*/
+ @TableField("payTime")
private Date payTime;
/**
* 第三方支付流水号
*/
+ @TableField("orderNumber")
private String orderNumber;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
+ @TableField("state")
private Integer state;
/**
* 添加时间
*/
+ @TableField("insertTime")
private Date insertTime;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 649cbd3..5a30e73 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -617,11 +617,11 @@
if (rechargeConfig.size() > 0 ){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
RechargeCentVo vo = new RechargeCentVo();
- vo.setAmount("¥ "+stringObjectMap.get("money"));
+ vo.setAmount(""+stringObjectMap.get("money"));
if (tAppUser.getIsVip() == 1){
- vo.setWpGold(stringObjectMap.get("MemberCoins")+"币");
+ vo.setWpGold(stringObjectMap.get("MemberCoins")+"");
}else {
- vo.setWpGold(stringObjectMap.get("usersCoins")+"币");
+ vo.setWpGold(stringObjectMap.get("usersCoins")+"");
}
centVos.add(vo);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index 5e91370..6a9bec7 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -73,12 +73,12 @@
if (coupon.getType() == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("满" + jsonObject.getDouble("num1") + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("num2") + "元");
+ couponListVo.setFavorable(jsonObject.getString("num2"));
}
if (coupon.getType() == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
- couponListVo.setFavorable(jsonObject.getDouble("num1") + "元");
+ couponListVo.setFavorable(jsonObject.getString("num1"));
}
if (coupon.getType() == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
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 27eeb56..302737d 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
@@ -105,7 +105,7 @@
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -114,7 +114,7 @@
continue;
}
couponListVo.setUseCondition("");
- couponListVo.setFavorable(num1 + "元");
+ couponListVo.setFavorable(num1 + "");
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -158,7 +158,7 @@
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
@@ -167,7 +167,7 @@
continue;
}
couponListVo.setUseCondition("");
- couponListVo.setFavorable(num1 + "元");
+ couponListVo.setFavorable(num1 + "");
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
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 471e3e0..387bc81 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
@@ -646,7 +646,7 @@
coursePackagePaymentService.save(coursePackagePayment);
}
- ResultUtil alipay = payMoneyUtil.alipay("购买课程", "", "", code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
+ ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", "", code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@Override
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/RechargeConfigClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/RechargeConfigClient.java
deleted file mode 100644
index 6e3383c..0000000
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/RechargeConfigClient.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.other.feignclient;
-
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-
-
-@FeignClient(value = "mb-cloud-other")
-public interface RechargeConfigClient {
-
- @PostMapping("/base/stored/getRechargeArrange")
- List<Map<String,Object>> getRechargeConfig();
-
-}
--
Gitblit v1.7.1