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

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

@@ -123,11 +123,9 @@ public class TempDirectorTrainingCampDetailWrapper {
         private String study;
 
         @ApiModelProperty(value = "目标效果")
-        @NotEmpty(message = "请填写目标效果")
         private String studyTarget;
 
         @ApiModelProperty(value = "需求或建议")
-        @NotEmpty(message = "请填写需求或建议")
         private String suggestion;
 
         @ApiModelProperty(value = "验证码")

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

@@ -165,9 +165,10 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
         }
         entity.setUserId(sysUser.getId());
         this.saveOrUpdate(entity);
+        TempDirectorTrainingCampDetail campDetail = this.getById(entity.getId());
         TempDirectorTrainingCampDetailWrapper.ApplyCampResult applyCampResult = new TempDirectorTrainingCampDetailWrapper.ApplyCampResult();
-        applyCampResult.setCampDetailId(entity.getId());
-        applyCampResult.setPaymentStatus(entity.getPaymentStatus());
+        applyCampResult.setCampDetailId(campDetail.getId());
+        applyCampResult.setPaymentStatus(campDetail.getPaymentStatus());
         // 删除缓存锁
         redissonClient.getBucket(submitLockKey).delete();
         return applyCampResult;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayPaymentService.java

@@ -35,7 +35,7 @@ public class YeepayPaymentService {
 		request.addParam("orderId", params.get("orderId"));
 		request.addParam("orderAmount", params.get("orderAmount"));
 		request.addParam("expiredTime", DateUtil.addMinutes(new Date(), 30));
-//		request.addParam("notifyUrl", params.get("notifyUrl"));
+		request.addParam("notifyUrl", params.get("notifyUrl"));
 		request.addParam("redirectUrl", params.get("redirectUrl"));
 		request.addParam("scene", params.get("scene"));
 		request.addParam("goodsName", params.get("goodsName"));