fix merger

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -18,10 +18,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.xml.soap.Name;
@@ -48,6 +45,8 @@ public class MusicGroupController extends BaseController {
     private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private StudentPaymentOrderService studentPaymentOrderService;
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryUserMusicGroups")
@@ -91,12 +90,14 @@ public class MusicGroupController extends BaseController {
     }
 
     @ApiOperation(value = "乐团报名支付")
-    @GetMapping("/pay")
+    @PostMapping("/pay")
     @ApiImplicitParams({@ApiImplicitParam(name = "registerPayDto", value = "支付信息", required = true, dataType = "Integer")})
     public HttpResponseResult pay(@RequestBody RegisterPayDto registerPayDto) {
+
         SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Integer userId = sysUser.getId();
         StudentRegistration studentRegistration = studentRegistrationService.get(registerPayDto.getRegisterId().longValue());
-        if (!studentRegistration.getUserId().equals(sysUser.getId())) {
+        if (!studentRegistration.getUserId().equals(userId)) {
             return failed("报名信息有误，请核查");
         }
 
@@ -121,7 +122,7 @@ public class MusicGroupController extends BaseController {
                 if (musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {//租赁
                     orderAmount.add(musicOneSubjectClassPlan.getDepositFee());
                 } else if (musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP)) {//团购
-                    orderAmount.add(goodsGroup.getPrice()).subtract(goodsGroup.getRemissionCourseFee());
+                    orderAmount.add(goodsGroup.getPrice()).subtract(goodsGroup.getRemissionCourseFee());//团购减免课程费用
                 }
             });
         }