Browse Source

配置问题

小么熊🐻 3 years ago
parent
commit
fcebebafd0

+ 3 - 6
jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptVideoVipController.java

@@ -4,18 +4,15 @@ package com.miaxis.app.controller.gzpt;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.domain.GzptVideoVip;
-import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
 import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
 import com.miaxis.newgzpt.service.IGzptVideoVipService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>

+ 3 - 4
jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -55,7 +55,7 @@ import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/wxjs")
+@RequestMapping(Constants.OPEN_PREFIX+"/wxjs")
 @Api(tags = {"【APP-微信支付】"})
 @Slf4j
 public class WxJsjpController extends BaseController {
@@ -94,10 +94,9 @@ public class WxJsjpController extends BaseController {
 
         //创建本地微信订单
         WxJsOrder order = new WxJsOrder();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        GzptUserInfo gzptUserInfo = userInfoService.getInfoById(68l);
+        GzptUserInfo gzptUserInfo = userInfoService.getInfoById(wxOrderDTO.getUserId());
 
-        String orderCode = getOrderCode(student.getId());
+        String orderCode = getOrderCode(gzptUserInfo.getId());
         order.setOutTradeNo(orderCode);
         order.setUserId(gzptUserInfo.getId());
         order.setUserName(gzptUserInfo.getUserName());

+ 2 - 1
jsjp-service/src/main/java/com/miaxis/wx/dto/WxOrderDTO.java

@@ -13,7 +13,8 @@ public class WxOrderDTO {
     private Long dictCode;
 
 
-
+    @ApiModelProperty(value = "用户id",required = true)
+    private Long userId;
 
 
 }