Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -354,7 +354,7 @@ public class StudentOrderController extends BaseController {
         } else if (orderByOrderNo.getGroupType().equals(GroupType.SPORADIC)) {
             if (Objects.nonNull(orderByOrderNo.getMusicGroupId())) {
                 if(orderByOrderNo.getType().equals(OrderTypeEnum.DIRECTOR_TRAINING_CAMP)){
-                    orderDetail.put("detail", tempDirectorTrainingCampDetailService.getById(orderByOrderNo.getMusicGroupId()));
+                    orderDetail.put("detail", tempDirectorTrainingCampDetailService.detail(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
                 }else {
                     List<SporadicChargeInfo> info = sporadicChargeInfoService.findByIds(orderByOrderNo.getMusicGroupId());
                     orderDetail.put("detail", info);

mec-application/src/main/java/com/ym/mec/student/controller/TempDirectorTrainingCampController.java

@@ -1,8 +1,13 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.TempDirectorTrainingCamp;
 import com.ym.mec.biz.dal.entity.TempDirectorTrainingCampDetail;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.wrapper.TempDirectorTrainingCampDetailWrapper;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.TempDirectorTrainingCampDetailService;
 import com.ym.mec.biz.service.TempDirectorTrainingCampService;
 import com.ym.mec.common.controller.BaseController;
@@ -10,11 +15,13 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 @Api(tags = "乐队指导训练营活动")
 @RestController
@@ -25,6 +32,8 @@ public class TempDirectorTrainingCampController extends BaseController {
     private TempDirectorTrainingCampService tempDirectorTrainingCampService;
     @Resource
     private TempDirectorTrainingCampDetailService tempDirectorTrainingCampDetailService;
+    @Resource
+    private StudentPaymentOrderService studentPaymentOrderService;
 
     @ApiOperation(value="获取训练营详情")
     @GetMapping(value = "/getDetail")
@@ -56,5 +65,23 @@ public class TempDirectorTrainingCampController extends BaseController {
     public HttpResponseResult pay(@RequestBody TempDirectorTrainingCampDetailWrapper.PayDto payDto) throws Exception {
         return tempDirectorTrainingCampDetailService.pay(payDto);
     }
+
+    @ApiOperation(value="获取支付详情")
+    @GetMapping(value = "/getPayDetail")
+    public HttpResponseResult<TempDirectorTrainingCampDetailWrapper.UserPayDetail> getPayDetail(Integer campId){
+        return succeed(tempDirectorTrainingCampDetailService.detail(campId));
+    }
+
+    @ApiOperation(value="是否有待支付的订单")
+    @GetMapping(value = "/hasUnpaidOrder")
+    public HttpResponseResult<Boolean> hasUnpaidOrder(Integer campId){
+        TempDirectorTrainingCampDetail campDetail = tempDirectorTrainingCampDetailService.getById(campId);
+        List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderService.queryByCondition(GroupType.SPORADIC,
+                campId.toString(),
+                campDetail.getUserId(),
+                DealStatusEnum.ING,
+                OrderTypeEnum.DIRECTOR_TRAINING_CAMP);
+        return succeed(CollectionUtils.isNotEmpty(studentPaymentOrders));
+    }
 }
 

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -81,21 +81,7 @@ public class TempDirectorTrainingCampDetailController extends BaseController {
         }
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(queryInfo.getTempDirectorTrainingCampId());
 
-        for (TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail record : records) {
-            record.setCityInfo(record.getProvince()+record.getCity()+record.getRegion());
-            if (StringUtils.isNotBlank(record.getPaymentStatus())) {
-                if ("PAID".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("已缴费");
-                } else if ("NO".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("未缴费");
-                } else if ("REFUND".equals(record.getPaymentStatus())) {
-                    record.setPaymentStatusName("已退费");
-                }
-            }
-            if (record.getPaymentDate() !=null) {
-                record.setPaymentDateStr(DateUtil.format(record.getPaymentDate(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
-            }
-        }
+
         TempDirectorTrainingCampDetailWrapper.DownloadInfo downloadInfo = generateExportExcelFile(records, TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail.class, trainingCamp.getName()+"导出", trainingCamp.getName()+"导出");
         return succeed(downloadInfo);
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TempDirectorTrainingCampDetailWrapper.java

@@ -50,14 +50,11 @@ public class TempDirectorTrainingCampDetailWrapper {
     @ApiModel("UserPayDetail")
     public static class UserPayDetail {
 
-        @ApiModelProperty(value = "身份证号")
+        @ApiModelProperty(value = "用户名")
         private String username;
 
-        @ApiModelProperty(value = "手机号")
-        private String mobile;
-
-        @ApiModelProperty(value = "训练营编号")
-        private Integer tempDirectorTrainingCampId;
+        @ApiModelProperty(value = "训练营名称")
+        private String campName;
     }
 
     @Data
@@ -266,8 +263,6 @@ public class TempDirectorTrainingCampDetailWrapper {
     @Data
     public static class TempDirectorTrainingCampDetailStat {
 
-
-
         @ApiModelProperty("报名人数")
         private Integer applyCount;
 
@@ -277,7 +272,6 @@ public class TempDirectorTrainingCampDetailWrapper {
         @ApiModelProperty("早鸟人数")
         private Integer birdCount;
 
-
         @ApiModelProperty("收款金额")
         private BigDecimal payAmount;
 

mec-biz/src/main/java/com/ym/mec/biz/service/TempDirectorTrainingCampDetailService.java

@@ -15,6 +15,8 @@ public interface TempDirectorTrainingCampDetailService extends IService<TempDire
 
     Integer applyCamp(TempDirectorTrainingCampDetailWrapper.ApplyCamp applyCamp);
 
+    TempDirectorTrainingCampDetailWrapper.UserPayDetail detail(Integer campId);
+
     HttpResponseResult pay(TempDirectorTrainingCampDetailWrapper.PayDto payDto) throws Exception;
 
     Boolean orderCallback(StudentPaymentOrder order);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -170,6 +170,19 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
     }
 
     @Override
+    public TempDirectorTrainingCampDetailWrapper.UserPayDetail detail(Integer campId) {
+        TempDirectorTrainingCampDetail campDetail = this.lambdaQuery().eq(TempDirectorTrainingCampDetail::getId, campId).one();
+        if(Objects.isNull(campDetail)){
+            throw new BizException("报名信息不存在");
+        }
+        TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.getById(campDetail.getTempDirectorTrainingCampId());
+        TempDirectorTrainingCampDetailWrapper.UserPayDetail userPayDetail = new TempDirectorTrainingCampDetailWrapper.UserPayDetail();
+        userPayDetail.setCampName(trainingCamp.getName());
+        userPayDetail.setUsername(campDetail.getUsername());
+        return userPayDetail;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult pay(TempDirectorTrainingCampDetailWrapper.PayDto payDto) throws Exception {
         Integer tempDirectorTrainingCampDetailId = payDto.getTempDirectorTrainingCampDetailId();
@@ -307,7 +320,26 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
 
     @Override
     public IPage<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> queryPage(IPage<Object> page, TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetailQuery queryInfo) {
-        return baseMapper.queryPage(page,queryInfo);
+        IPage<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> tempDirectorTrainingCampDetailIPage = baseMapper.queryPage(page, queryInfo);
+        List<TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail> records = tempDirectorTrainingCampDetailIPage.getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            for (TempDirectorTrainingCampDetailWrapper.TempDirectorTrainingCampDetail record : records) {
+                record.setCityInfo(record.getProvince()+"/"+record.getCity()+"/"+record.getRegion());
+                if (StringUtils.isNotBlank(record.getPaymentStatus())) {
+                    if ("PAID".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("已缴费");
+                    } else if ("NO".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("未缴费");
+                    } else if ("REFUND".equals(record.getPaymentStatus())) {
+                        record.setPaymentStatusName("已退费");
+                    }
+                }
+                if (record.getPaymentDate() !=null) {
+                    record.setPaymentDateStr(DateUtil.format(record.getPaymentDate(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
+                }
+            }
+        }
+        return tempDirectorTrainingCampDetailIPage;
     }
 
     @Override