|  | @@ -10,9 +10,11 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.dto.req.OrderPayReq;
 |  |  import com.yonge.cooleshow.biz.dal.dto.req.OrderPayReq;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 |  |  import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 |  |  import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 | 
											
												
													
														|  | 
 |  | +import com.yonge.cooleshow.biz.dal.entity.Student;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 |  |  import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 |  |  import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 |  |  import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 | 
											
												
													
														|  | 
 |  | +import com.yonge.cooleshow.biz.dal.service.StudentService;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
 |  |  import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 |  |  import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 | 
											
												
													
														|  |  import com.yonge.cooleshow.biz.dal.service.UserPaymentCoreService;
 |  |  import com.yonge.cooleshow.biz.dal.service.UserPaymentCoreService;
 | 
											
										
											
												
													
														|  | @@ -78,6 +80,9 @@ public class UserOrderController extends BaseController {
 | 
											
												
													
														|  |      @Autowired
 |  |      @Autowired
 | 
											
												
													
														|  |      private UserPaymentCoreService userPaymentCoreService;
 |  |      private UserPaymentCoreService userPaymentCoreService;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @Autowired
 | 
											
												
													
														|  | 
 |  | +    private StudentService studentService;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      @ApiOperation(value = "下单接口")
 |  |      @ApiOperation(value = "下单接口")
 | 
											
												
													
														|  |      @PostMapping("/executeOrder")
 |  |      @PostMapping("/executeOrder")
 | 
											
												
													
														|  |      public HttpResponseResult<UserOrder> executeOrder(@Valid @RequestBody OrderReq orderReq) {
 |  |      public HttpResponseResult<UserOrder> executeOrder(@Valid @RequestBody OrderReq orderReq) {
 | 
											
										
											
												
													
														|  | @@ -290,10 +295,14 @@ public class UserOrderController extends BaseController {
 | 
											
												
													
														|  |          orderReq.setUserId(sysUser.getId());
 |  |          orderReq.setUserId(sysUser.getId());
 | 
											
												
													
														|  |          orderReq.setPaymentClient(ClientEnum.STUDENT.name());
 |  |          orderReq.setPaymentClient(ClientEnum.STUDENT.name());
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +        // 如果是机构的学生
 | 
											
												
													
														|  | 
 |  | +        Student student = studentService.getById(sysUser.getId());
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          // 用户下单请求
 |  |          // 用户下单请求
 | 
											
												
													
														|  |          UserPaymentOrderWrapper.UserPaymentOrder order = JSON.parseObject(orderReq.jsonString(), UserPaymentOrderWrapper.UserPaymentOrder.class);
 |  |          UserPaymentOrderWrapper.UserPaymentOrder order = JSON.parseObject(orderReq.jsonString(), UserPaymentOrderWrapper.UserPaymentOrder.class);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +        order.setTenantId(student.getTenantId());
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |          // 新增数据
 |  |          // 新增数据
 | 
											
												
													
														|  |          UserPaymentOrderWrapper.PaymentConfig paymentConfig = userPaymentCoreService.executeOrderCreate(order);
 |  |          UserPaymentOrderWrapper.PaymentConfig paymentConfig = userPaymentCoreService.executeOrderCreate(order);
 | 
											
												
													
														|  |          if (Objects.isNull(paymentConfig)) {
 |  |          if (Objects.isNull(paymentConfig)) {
 |