Althars123 2 жил өмнө
parent
commit
2923241372

+ 3 - 3
sdjk-admin/src/main/java/com/miaxis/app/controller/vip/RecommendCodeController.java

@@ -33,7 +33,7 @@ public class RecommendCodeController extends BaseController{
     private IUserInfoService userInfoService;
     @GetMapping
     @ApiOperation("验证推荐码是否有效")
-    public Response<Integer> validateRecommendCode(String recommendCode){
+    public Response validateRecommendCode(String recommendCode){
 
         if (StringUtils.isEmpty(recommendCode)){
             throw new CustomException("推荐码不能为空");
@@ -47,8 +47,8 @@ public class RecommendCodeController extends BaseController{
         //当前学员更新绑定推荐码
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
         student.setBindRecommendCode(recommendCode);
-        userInfoService.updateById(userInfo);
-        return Response.success();
+        userInfoService.updateById(student);
+        return Response.success("验证成功");
     }
 
 

+ 15 - 6
sdjk-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -1,8 +1,11 @@
 package com.miaxis.wx.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.enums.OrderStatusEnum;
+import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.system.service.ISysConfigService;
+import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.PcWxOrderListDTO;
 import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
@@ -32,20 +35,26 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     @Autowired
     private ISysConfigService configService;
 
-
     @Autowired
-    private IRefundRecordService refundRecordService;
+    private IUserInfoService userInfoService;
 
 
 
     @Override
     public void createVipOrder(WxOrder wxOrder) {
         String price = null ;
-        if (wxOrder.getReferralUserId() == null){
-            price = configService.selectConfigByKey("vip_price");
-        }else {
-            price = configService.selectConfigByKey("vip_price_referral");
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        UserInfo userInfo = userInfoService.getById(student.getId());
+        if (userInfo.getBindRecommendCode()!=null){
+            price = configService.selectConfigByKey("vip_price_recommend");
+        }else{
+            if (wxOrder.getReferralUserId() == null){
+                price = configService.selectConfigByKey("vip_price");
+            }else {
+                price = configService.selectConfigByKey("vip_price_referral");
+            }
         }
+
         Double dprice = Double.valueOf(price);
         Double v =dprice* 100;
         wxOrder.setTotal(v.intValue());