修改开团添加是否单乐器的选项接口

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -279,7 +279,6 @@ public class YqPayController extends BaseController {
         order.setAccount(userOrder.getAccount());
         order.setUAccount(userOrder.getUAccount());
 
-
         //1.关闭订单
         HashMap<String, Object> upMap = new HashMap<>();
         upMap.put("status", 0);
@@ -288,10 +287,7 @@ public class YqPayController extends BaseController {
         orderService.updateByIdAndStatus(upMap);
         //2、插入订单
         orderService.insert(order);
-        //3、修改已报名人数
-//        courseGroupInfo.setRegNum(courseGroupInfo.getRegNum() + 1);
-//        CourseGroupInfoService.upByIdAndVersion(courseGroupInfo);
-        //4、修改分佣账户已收金额
+        //3、修改分佣账户已收金额
         BigDecimal HasRouting = routingAccount.getHasRouting().add(order.getAmount()).subtract(userOrder.getAmount());
         routingAccount.setHasRouting(HasRouting);
         accountService.upByIdAndVersion(routingAccount);
@@ -419,14 +415,15 @@ public class YqPayController extends BaseController {
      * @throws Exception
      */
     @PostMapping("/platformtransferacc")
-    public String platformTransferAcc() throws Exception {
+    public String platformTransferAcc(String payeeNo, String payeeName,String amount,String remarks) throws Exception {
         String notifyUrl = ""; //回调地址
+        String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
         Map<String, Object> resultMap = new LinkedHashMap<>();
-        resultMap.put("payeeNo", ""); //收款方商户号
-        resultMap.put("payeeName", ""); //收款方姓名
-        resultMap.put("amount", ""); //金额
-        resultMap.put("merOrderNo", ""); //商户订单号
-        resultMap.put("remarks", ""); //备注
+        resultMap.put("payeeNo", payeeNo); //收款方商户号
+        resultMap.put("payeeName", payeeName); //收款方姓名
+        resultMap.put("amount", amount); //金额
+        resultMap.put("merOrderNo", orderNo); //商户订单号
+        resultMap.put("remarks", remarks); //备注
         Map<String, Object> requestMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
         return yqPayService.platformTransferAcc(requestMap);
     }
@@ -512,7 +509,7 @@ public class YqPayController extends BaseController {
     }
 
 
-    // @Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     //@RequestMapping("/getOrderStatus")
     public void getOrderStatus() throws Exception {
 

src/main/java/com/ym/mec/collectfee/controller/YqRegController.java

@@ -29,7 +29,7 @@ public class YqRegController {
      * @return
      * @throws Exception
      */
-    @GetMapping("/per")
+   // @GetMapping("/per")
     public String per(ModelMap map) throws Exception {
 
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
@@ -47,7 +47,7 @@ public class YqRegController {
         return "/reg/register";
     }
 
-    @GetMapping("/com")
+   // @GetMapping("/com")
     public String com(ModelMap map) throws Exception {
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
 
@@ -64,7 +64,7 @@ public class YqRegController {
         return "/reg/register";
     }
 
-    @GetMapping("/pcy")
+   // @GetMapping("/pcy")
     public String pcy(ModelMap map) throws Exception {
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
 
@@ -81,52 +81,7 @@ public class YqRegController {
         return "/reg/register";
     }
 
-    @RequestMapping("/topay")
-    public String toPay(ModelMap map) throws Exception {
-
-        String orderNo = GenerateNum.getInstance().GenerateOrderNo();
-        Order order = new Order();
-        order.setOrderNo(orderNo);
-        order.setCreateTime(new Date());
-        order.setStatus(1);
-        order.setAmount(new BigDecimal(3));
-
-        /*卖家双乾商户号*/
-        String sellerNo = "0021677"; //大雅主体商户号
-        order.setAccount(sellerNo);
-        /*订单信息*/
-        String orderBody = "大雅乐盟培训课程";
-        /*订单标题*/
-        String orderSubject = "培训订单";
-
-        String notifyUrl = "http://47.99.212.176:9000/yqpay/notify";
-        String returnUrl = "http://dev.dayaedu.com";//前台页面通知地址(银联H5必填)
-        String payChannels = "{\"fastpayXy\":true,\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"aliPayMobile\":true,\"balancePay\":false}";
-
-
-        Map<String, Object> routingList = new LinkedHashMap<String, Object>();
-        routingList.put("routingMerNo", "0022652"); //分佣账户
-        routingList.put("routingFee", "0.1"); //分佣金额
-        List<Map> tempRoutingList = new ArrayList();
-        tempRoutingList.add(routingList);
-
-        Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
-        resultMap.put("sellerNo", sellerNo); //收款商户号
-        resultMap.put("payChannels", payChannels); //支付方式
-        resultMap.put("orderBody", orderBody); //订单信息
-        resultMap.put("payAmount", order.getAmount()); //支付金额
-        resultMap.put("apiPayType", "1"); //*API支付类型1-即时支付,2-担保支付,3-预授权支付*/
-        resultMap.put("tradeType", "0"); //*交易类型1—充值，0—收款*
-        resultMap.put("merMerOrderNo", orderNo); //商户订单号
-        resultMap.put("orderSubject", orderSubject); //订单标题
-        resultMap.put("returnUrl", returnUrl); //前台页面地址
-        resultMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
-        Map rqMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
-        map.put("info", rqMap);
-        return "/reg/order";
-    }
-
-    @GetMapping("/webcom")
+   // @GetMapping("/webcom")
     public String webcom(ModelMap map) throws Exception {
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
 
@@ -143,7 +98,7 @@ public class YqRegController {
         return "/reg/register";
     }
 
-    @GetMapping("/webper")
+   // @GetMapping("/webper")
     public String webper(ModelMap map) throws Exception {
 
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
@@ -161,7 +116,7 @@ public class YqRegController {
         return "/reg/register";
     }
 
-    @GetMapping("/webpcy")
+   // @GetMapping("/webpcy")
     public String webpcy(ModelMap map) throws Exception {
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //主动通知地址
 

src/main/resources/templates/reg/order.ftl

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh_cn">
-<head>
-    <meta charset="UTF-8">
-    <title>register</title>
-</head>
-<body>
-<form action="https://qyfapi.95epay.com/api/api/hPay/toPayHtml" method="POST" id="sent_register">
-    <p>First merNo: <input type="text" name="merNo" value="${info.merNo}"/></p>
-    <p>Last version: <input type="text" name="version" value="${info.version}"/></p>
-    <p>Last notifyUrl: <input type="text" name="notifyUrl" value="${info.notifyUrl}"/></p>
-    <p>Last timestamp: <input type="text" name="timestamp" value="${info.timestamp}"/></p>
-    <p>Last apiContent: <input type="text" name="apiContent" value='${info.apiContent}'/></p>
-    <p>Last signType: <input type="text" name="signType" value="${info.signType}"/></p>
-    <p>Last sign: <input type="text" name="sign" value="${info.sign}"/></p>
-    <input type="submit">
-</form>
-</body>
-<script type="text/javascript">
-    window.onload = function () {
-        document.getElementById("sent_register").submit()
-    }
-</script>
-</html>