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(); }
@@ -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(); }
@@ -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;
@@ -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); } 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); 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); 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 cloud-server-other/src/main/java/com/dsh/other/feignclient/RechargeConfigClient.java
File was deleted
