Browse Source

添加参赛姓名和联系方式

Memory_LG 1 tháng trước cách đây
mục cha
commit
b172c3d4a9

+ 15 - 15
qmjszx-admin/src/main/java/beilv/web/controller/stadium/StadiumController.java

@@ -44,21 +44,21 @@ public class StadiumController extends BaseController {
     }
 
 
-    /**
-     * 添加订单
-     * 写入订单信息: 下单人id, 订单编号, 下单时间, 支付状态:待支付
-     * 调用者传递参数: 用户id, 联系人, 联系电话, 赛事id, 订单类型,
-     * return orderId  订单id
-     */
-    @PostMapping("/toBeStadium")
-    public AjaxResult addStadium(@RequestBody Stadium stadium) {
-        String orderId = stadiumService.toBeStadium(stadium);
-        if (StringUtils.isNotEmpty(orderId)) {
-            return AjaxResult.success("下单成功",orderId);
-        } else {
-            return AjaxResult.error("下单失败");
-        }
-    }
+//    /**
+//     * 添加订单
+//     * 写入订单信息: 下单人id, 订单编号, 下单时间, 支付状态:待支付
+//     * 调用者传递参数: 用户id, 联系人, 联系电话, 赛事id, 订单类型,
+//     * return orderId  订单id
+//     */
+//    @PostMapping("/toBeStadium")
+//    public AjaxResult addStadium(@RequestBody Stadium stadium) {
+//        String orderId = stadiumService.toBeStadium(stadium);
+//        if (StringUtils.isNotEmpty(orderId)) {
+//            return AjaxResult.success("下单成功",orderId);
+//        } else {
+//            return AjaxResult.error("下单失败");
+//        }
+//    }
 //
 //    /**
 //     * 通过订单id取消订单

+ 4 - 1
qmjszx-business/src/main/java/beilv/vipCardLog/domain/VipCardLog.java

@@ -111,5 +111,8 @@ public class VipCardLog extends BaseEntity {
     private String paymentId;
     private String username;
     private String mobile;
-    
+    private String competitionName;
+    private String competitionMobile;
+    private BigDecimal refundPrice;
+
 }

+ 3 - 1
qmjszx-business/src/main/java/beilv/vipCardLog/service/impl/VipCardLogServiceImpl.java

@@ -268,7 +268,9 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
             refundPrice = refundPrice.add(orderInfo.getPracticalMoney());
         }
 
-        if ("vipCard".equals(orderInfo.getPaymentType())) {
+        vipCardLog.setRefundPrice(refundPrice);
+
+        if("vipCard".equals(orderInfo.getPaymentType())){
             //查询会员卡信息
             VipCard vipCard = vipCardService.selectVipCardById(orderInfo.getPaymentId());
             vipCard.setBalance(vipCard.getBalance().add(refundPrice));

+ 5 - 0
qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml

@@ -73,6 +73,8 @@
             <if test="originalPrice != null">original_price,</if>
             <if test="memberPrice != null">member_price,</if>
             <if test="paymentId != null">payment_id,</if>
+            <if test="competitionName != null">competition_name,</if>
+            <if test="competitionMobile != null">competition_mobile,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -90,6 +92,8 @@
             <if test="originalPrice != null">#{originalPrice},</if>
             <if test="memberPrice != null">#{memberPrice},</if>
             <if test="paymentId != null">#{paymentId},</if>
+            <if test="competitionName != null">#{competitionName},</if>
+            <if test="competitionMobile != null">#{competitionMobile},</if>
         </trim>
     </insert>
 
@@ -110,6 +114,7 @@
             <if test="originalPrice != null">original_price = #{originalPrice},</if>
             <if test="memberPrice != null">member_price = #{memberPrice},</if>
             <if test="paymentId != null">payment_id = #{paymentId},</if>
+            <if test="refundPrice != null">refund_price = #{refundPrice},</if>
         </trim>
         <where>
             <if test="id != null and id != ''">