|
@@ -1,20 +1,22 @@
|
|
|
package com.ym.mec.collectfee.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ym.mec.collectfee.common.web.BaseController;
|
|
|
import com.ym.mec.collectfee.entity.Account;
|
|
|
+import com.ym.mec.collectfee.entity.CourseGroupInfo;
|
|
|
+import com.ym.mec.collectfee.entity.Instrument;
|
|
|
import com.ym.mec.collectfee.entity.Order;
|
|
|
-import com.ym.mec.collectfee.service.AccountService;
|
|
|
-import com.ym.mec.collectfee.service.OrderService;
|
|
|
-import com.ym.mec.collectfee.service.YqPayService;
|
|
|
-import com.ym.mec.collectfee.service.YqQueryService;
|
|
|
+import com.ym.mec.collectfee.service.*;
|
|
|
import com.ym.mec.collectfee.utils.GenerateNum;
|
|
|
import com.ym.mec.collectfee.utils.yqpay.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.io.IOUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
+import org.springframework.core.io.ClassPathResource;
|
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import springfox.documentation.annotations.ApiIgnore;
|
|
|
|
|
|
+import java.io.InputStreamReader;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -43,6 +46,8 @@ public class YqPayController extends BaseController {
|
|
|
private OrderService orderService;
|
|
|
@Autowired
|
|
|
private AccountService accountService;
|
|
|
+ @Autowired
|
|
|
+ private CourseGroupInfoService CourseGroupInfoService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -56,6 +61,16 @@ public class YqPayController extends BaseController {
|
|
|
@Transactional
|
|
|
public Map toPay(@ModelAttribute @Validated Order order) throws Exception {
|
|
|
|
|
|
+ //2、判断已报名人数
|
|
|
+ CourseGroupInfo courseGroupInfo = CourseGroupInfoService.get(order.getCourse_id());
|
|
|
+
|
|
|
+// ClassPathResource classPathResource = new ClassPathResource("instruments.json");
|
|
|
+//
|
|
|
+// String str = IOUtils.toString(new InputStreamReader(classPathResource.getInputStream(),"UTF-8"));
|
|
|
+// Instrument instrument = JSONObject.parseObject(str, Instrument.class);
|
|
|
+//
|
|
|
+// System.out.println(instrument.getInstruments().get("flute").get("config"));
|
|
|
+
|
|
|
String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //异步通知地址
|
|
|
String returnUrl = "http://dev.dayaedu.com";//支付后返回页面
|
|
|
String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
|
|
@@ -66,8 +81,6 @@ public class YqPayController extends BaseController {
|
|
|
order.setCreateTime(new Date()); //订单提交时间
|
|
|
order.setStatus(1); //订单状态
|
|
|
|
|
|
- orderService.insert(order);
|
|
|
-
|
|
|
//获取支付成功跟支付中的订单数
|
|
|
int branchId = order.getBranchId();
|
|
|
int payOrderNums = orderService.getPayOrderNums();
|
|
@@ -79,6 +92,8 @@ public class YqPayController extends BaseController {
|
|
|
//获取分佣账户
|
|
|
Account account = accountService.getAccountByBranchId(branchId);
|
|
|
String routingMerNo = account.getSellerNo();
|
|
|
+ BigDecimal HasRouting = account.getHasRouting().add(order.getAmount());
|
|
|
+ account.setHasRouting(HasRouting);
|
|
|
|
|
|
Map<String, Object> routingList = new LinkedHashMap<String, Object>();
|
|
|
routingList.put("routingMerNo", routingMerNo);//分佣账户
|
|
@@ -86,6 +101,16 @@ public class YqPayController extends BaseController {
|
|
|
List<Map> tempRoutingList = new ArrayList();
|
|
|
tempRoutingList.add(routingList);
|
|
|
|
|
|
+
|
|
|
+ //1、插入订单
|
|
|
+ orderService.insert(order);
|
|
|
+ //2、修改已报名人数
|
|
|
+ courseGroupInfo.setRegNum(courseGroupInfo.getRegNum()+1);
|
|
|
+ CourseGroupInfoService.upByIdAndVersion(courseGroupInfo);
|
|
|
+ //3、修改分佣账户已收金额
|
|
|
+ accountService.upByIdAndVersion(account);
|
|
|
+
|
|
|
+
|
|
|
/*订单信息*/
|
|
|
String orderBody = "大雅乐盟培训课程";
|
|
|
/*订单标题*/
|