|
@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
+import com.ym.mec.common.service.IdGeneratorService;
|
|
|
import com.ym.mec.util.string.IdWorker;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
@@ -47,9 +48,10 @@ public class MusicGroupController extends BaseController {
|
|
|
private StudentPaymentOrderService studentPaymentOrderService;
|
|
|
@Autowired
|
|
|
private PayService payService;
|
|
|
-
|
|
|
@Autowired
|
|
|
private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
|
|
|
+ @Autowired
|
|
|
+ private IdGeneratorService idGeneratorService;
|
|
|
|
|
|
@ApiOperation("获取学生所在乐团列表")
|
|
|
@GetMapping(value = "/queryUserMusicGroups")
|
|
@@ -233,8 +235,7 @@ public class MusicGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- IdWorker idWorker = new IdWorker(0, 0);
|
|
|
- String orderNo = "1017"+idWorker.nextId();
|
|
|
+ String orderNo = idGeneratorService.generatorId("payment")+"";
|
|
|
|
|
|
Map payMap = payService.getPayMap(orderAmount, orderNo, "https://pay.dayaedu.com/api/yqpay/notify", "http://dev.dayaedu.com", "测试订单", "测试订单");
|
|
|
|