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

mec-application/src/main/java/com/ym/mec/config/ResourceServerConfig.java

@@ -37,7 +37,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/*/v2/api-docs", "/*/code/*",
 
                 //student
-                        "/api-student/wechat/*","/api-student/area/*","/api-student/tempDirectorTrainingCamp/*", "/api-student/student/registering", "/api-student/register/*", "/api-student/studentOrder/**", "/api-student/musicGroup/getSubjectGoodsAndInfo",
+                        "/api-student/wechat/*","/api-student/tempDirectorTrainingCamp/*", "/api-student/student/registering", "/api-student/register/*", "/api-student/studentOrder/**", "/api-student/musicGroup/getSubjectGoodsAndInfo",
                         "/api-student/musicGroup/getMusicGroupStatus", "/api-student/musicGroup/getOrderStatus","/api-student/sysCouponCode/queryPage",
                         "/api-student/musicGroup/pay", "/api-student/musicGroup/rePay", "/api-student/studentManage/queryStudentPer",
                         "/api-student/sporadicChargeInfo/get", "/api-student/sporadicChargeInfo/sporadicPay", "/api-student/repair/getRepairInfo", "/api-student/repair/payRepair",

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

@@ -1,45 +0,0 @@
-package com.ym.mec.student.controller;
-
-import com.ym.mec.biz.dal.dto.TreeDto;
-import com.ym.mec.biz.service.SysAreaService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RequestMapping("${app-config.url.student:}/area")
-@Api(tags = "区域服务")
-@RestController
-public class SysAreaController extends BaseController {
-
-    @Resource
-    private SysAreaService sysAreaService;
-
-    @ApiOperation(value = "根据父节点查询区域树状列表（递归）")
-    @GetMapping("/queryTree")
-    public Object queryPage(TreeDto treeDto){
-        if(treeDto.getParentId() == 0){
-            return failed("非法参数");
-        }
-        return succeed(sysAreaService.queryTreePage(treeDto));
-    }
-
-    @ApiOperation(value = "根据父节点查询下一级子节点列表（不递归）")
-    @GetMapping("/queryChild")
-    public Object queryChild(TreeDto treeDto){
-        return succeed(sysAreaService.queryChild(treeDto));
-    }
-
-    @ApiOperation(value = "根据子级区域获取父级节点")
-    @GetMapping("/getParentArea/{id}")
-    @ApiParam(value = "区域编号", required = true)
-    public Object getParentArea( @PathVariable("id") Integer id){
-        return succeed(sysAreaService.getParentArea(id));
-    }
-}

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

@@ -188,6 +188,47 @@ public class PayServiceImpl implements PayService {
 			}
 			
 		}
+		
+		//如果是乐队指导培训的订单，由武汉学校收款
+		if(studentPaymentOrder != null && studentPaymentOrder.getType() == OrderTypeEnum.DIRECTOR_TRAINING_CAMP) {
+			
+			Integer routeOrganId = 50;
+			HfMember receiverMember = hfMemberDao.getByOrganId(routeOrganId, paymentChannelStr);
+			
+			if(receiverMember == null) {
+        		throw new BizException("分部[{}]收款账户查询失败", routeOrganId);
+			}
+			
+			String merNo = receiverMember.getMemberId();
+        	if(StringUtils.isBlank(merNo)){
+        		throw new BizException("平台收款账户查询失败");
+        	}
+			
+			StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
+            studentPaymentRouteOrder.setOrderNo(orderNo);
+            studentPaymentRouteOrder.setRouteOrganId(routeOrganId);
+            studentPaymentRouteOrder.setFeeFlag("Y");
+            studentPaymentRouteOrder.setRouteAmount(amount);
+            studentPaymentRouteOrder.setRouteBalanceAmount(balanceAmount);
+            studentPaymentRouteOrder.setMerNo(merNo);
+            studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
+            studentPaymentRouteOrder.setServiceAmount(amount);
+            studentPaymentRouteOrder.setTenantId(tenantId);
+            studentPaymentRouteOrder.setCreateTime(date);
+            studentPaymentRouteOrder.setUpdateTime(date);
+            studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
+            
+            Map<String, Object> unionPay = new HashMap<>();
+            Map<String, Object> payMap = null;
+
+        	payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, returnUrl, orderSubject, orderBody);
+
+            unionPay.put("orderNo", orderNo);
+            unionPay.put("type", paymentChannel.getCode());
+            unionPay.put("payMap", payMap);
+            unionPay.put("routingMerNos", merNo);
+            return unionPay;
+		}
 
 		BigDecimal subBalance = BigDecimal.ZERO;