提现

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseGroupController.java

@@ -1,12 +1,9 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseGroupDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseGroupSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
-import com.yonge.cooleshow.biz.dal.sdk.WithdrawSdk;
 import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -17,14 +14,11 @@ import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 
 /**
  * @Author: cy
@@ -41,10 +35,8 @@ public class CourseGroupController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private CourseScheduleService courseScheduleService;
-    @Autowired
-    private WithdrawSdk sdk;
 
-    @ApiOperation(value = "课程组管理-陪练课",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-陪练课", notes = "{\n" +
             "    \"subjectId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
@@ -54,7 +46,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPracticeGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-陪练课-详情",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-陪练课-详情", notes = "{\n" +
             "    \"courseGroupId\": 140,\n" +
             "    \"teacherSign\": 0,\n" +
             "    \"studentSign\": 0,\n" +
@@ -69,7 +61,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPracticeGroupDetail(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-直播课", notes = "{\n" +
             "    \"subjectId\":73,\n" +
             "    \"search\":\"夏\",\n" +
             "    \"status\":\"ING\"\n" +
@@ -79,7 +71,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课-购买学员",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-直播课-购买学员", notes = "{\n" +
             "    \"groupId\":140,\n" +
             "    \"search\":\"游\",\n" +
             "    \"orderNo\":\"22051615250800001\"\n" +
@@ -89,7 +81,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroupStudent(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课-教学计划",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-直播课-教学计划", notes = "{\n" +
             "    \"groupId\":140,\n" +
             "    \"courseId\":\"391\",\n" +
             "    \"salaryStatus\":\"NOT_START\",\n" +
@@ -101,7 +93,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroupPlan(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-视频课", notes = "{\n" +
             "    \"subjectId\":21,\n" +
             "    \"search\":\"老\"\n" +
             "}")
@@ -110,7 +102,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectVideoGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课-购买学员",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-视频课-购买学员", notes = "{\n" +
             "    \"groupId\":51,\n" +
             "    \"orderNo\":\"22050720002900001\",\n" +
             "    \"search\":\"1\",\n" +
@@ -122,7 +114,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectVideoGroupStudent(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课-教学计划",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-视频课-教学计划", notes = "{\n" +
             "    \"groupId\":18\n" +
             "}")
     @PostMapping(value = "/video/plan")
@@ -136,7 +128,7 @@ public class CourseGroupController extends BaseController {
         return succeed(courseGroupService.selectLiveGroupInfo(groupId));
     }
 
-    @ApiOperation(value = "课程组管理-琴房课",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-琴房课", notes = "{\n" +
             "    \"subjectId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
@@ -146,7 +138,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-琴房课-详情",notes = "{\n" +
+    @ApiOperation(value = "课程组管理-琴房课-详情", notes = "{\n" +
             "    \"courseGroupId\":334,\n" +
             "    \"search\":\"\",\n" +
             "    \"status\":\"\",\n" +
@@ -163,10 +155,10 @@ public class CourseGroupController extends BaseController {
     @ApiOperation(value = "课程组管理-琴房课-详情-学员名单")
     @GetMapping(value = "/piano/student")
     public HttpResponseResult<List<StudentSignVo>> studentSign(@NotNull Long courseId) {
-        return succeed(courseGroupService.studentSign(courseId,null));
+        return succeed(courseGroupService.studentSign(courseId, null));
     }
 
-    @ApiOperation(value = "学员管理-琴房课",notes = "{\n" +
+    @ApiOperation(value = "学员管理-琴房课", notes = "{\n" +
             "    \"studentId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
@@ -176,7 +168,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupStudent(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "学员管理-琴房课-详情",notes = "{\n" +
+    @ApiOperation(value = "学员管理-琴房课-详情", notes = "{\n" +
             "    \"studentId\":20,\n" +
             "    \"courseGroupId\":334,\n" +
             "    \"search\":\"\",\n" +
@@ -197,7 +189,7 @@ public class CourseGroupController extends BaseController {
         return succeed(courseScheduleService.selectRemainTime(teacherId));
     }
 
-    @ApiOperation(value = "老师管理-琴房课",notes = "{\n" +
+    @ApiOperation(value = "老师管理-琴房课", notes = "{\n" +
             "    \"teacherId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
@@ -207,7 +199,7 @@ public class CourseGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupTeacher(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "老师管理-琴房课-详情",notes = "{\n" +
+    @ApiOperation(value = "老师管理-琴房课-详情", notes = "{\n" +
             "    \"teacherId\":20,\n" +
             "    \"courseGroupId\":334,\n" +
             "    \"search\":\"\",\n" +
@@ -221,10 +213,4 @@ public class CourseGroupController extends BaseController {
     public HttpResponseResult<PageInfo<CourseGroupPianoDetailVo>> selectPianoGroupTeacherDetail(@Validated @RequestBody CourseGroupDetailSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupTeacherDetail(PageUtil.getPage(search), search)));
     }
-
-
-    @GetMapping("/test")
-    public void aaa(){
-        sdk.test();
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/sdk/WithdrawSdk.java

@@ -10,14 +10,6 @@ import com.yonge.toolset.thirdparty.lingxinpay.RSA;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.http.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,7 +19,6 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * @author: cy
@@ -204,8 +195,12 @@ public class WithdrawSdk {
         try {
             String resultJsonStr = HttpUtil.postForHttp(apiUrl + "/bpotop_trade/single", JSONObject.toJSONString(mapParam), null);
             logger.info("单笔请求返回参数：{}", resultJsonStr);
+
             Map<String,Object> mapTypes = JSON.parseObject(resultJsonStr);
-            return HttpResponseResult.succeed(true);
+            String returnCode = String.valueOf(mapTypes.get("return_code"));
+            if (returnCode.equals("T")){
+                return HttpResponseResult.succeed(true);
+            }
         } catch (IOException e) {
             logger.info("发送失败：{}", e);
         }
@@ -248,101 +243,4 @@ public class WithdrawSdk {
         }
         return null;
     }
-
-
-    public void test(){
-        //输入商户订单号
-        String outerOrderNo = UUID.randomUUID().toString().substring(0,12);
-        System.out.println(outerOrderNo);
-        //输入收款人手机号
-        String name = "何亮";
-        //输入收款人姓名
-        String mobile = "17600220933";
-        //输入收款人身份证号
-        String certificateNo = "130423199206192818";
-        //输入转账金额（单位分）
-        String predictAmount = "1";
-        //输入收款人账号
-        String payAccount = "6228480018864836772";
-        //输入卡类型：DC借记卡，CC信用卡（暂不支持）
-        String cardType = "DC";
-        //输入发放类型（0：工资，1：奖金，2：绩效，3：劳务，4：个人经营所得，5：其他）
-        String salaryType = "4";
-        //输入项目名称
-        String projectName = "测试";
-        //输入支付类型（1：银行卡）
-        String payType = "1";
-        //输入卡属性:(C:对私 ,B：对公）暂时不支持对公
-        String cardAttribute = "C";
-        String requestParam = doSign(outerOrderNo, name, mobile, certificateNo, predictAmount, payAccount, cardType,
-                salaryType, projectName, payType, cardAttribute);
-        String resultJsonStr = doPost("http://39.107.15.64:8090/bpotop_trade/single", requestParam);
-        System.out.println("单笔请求返回参数：{}"+resultJsonStr);
-        Map<String,Object> mapTypes = JSON.parseObject(resultJsonStr);
-        System.out.println(mapTypes);
-    }
-    private static String pk="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYT5eCY6r8sGWgbiId/VqSZmS6XkBNGMkzUqTIkpkecOzsFBxFXTQmgDeR991YfgqmyOaHsJ/ons/H+e8l+RmHsOm4eErFU+9qXFq+k195YFV1vAR9O7MIG+FR5vmLDuhgimPsgqscWhUrGinc8RUpi5KwClgx7d+d8ZJ4GmkR0QIDAQAB";
-    private static String md5="0fd42370bad6485e46718b97f3dd1536";
-
-    public static String doSign(String outerOrderNo, String name, String mobile, String certificateNo, String predictAmount,
-                                String payAccount, String cardType, String salaryType, String projectName, String payType, String cardAttribute){
-        Map<String, Object> map = new HashMap<>();
-        //输入商户号
-        String memberNo = "1491663782974988288";
-
-        map.put("outMemberNo", memberNo);
-        map.put("outerOrderNo", outerOrderNo);
-        map.put("name", name);
-        map.put("certificateNo", certificateNo);
-        map.put("predictAmount", predictAmount);
-        String signs = Md5EncryptUtils.sign(map, md5);
-        map.put("charset", "UTF-8");
-        map.put("mobile", mobile);
-        map.put("version", "1.1");
-        map.put("service", "bpotop.zx.pay.order");
-        map.put("Md5Key", signs);
-        map.put("notifyUrl", "http://apis.bpotop.com/bpotop_trade/test");
-        map.put("cardType", cardType);
-        map.put("salaryType", salaryType);
-        map.put("projectName", projectName);
-        map.put("payType", payType);
-        map.put("cardAttribute", cardAttribute);
-        map.put("payAccount", payAccount);
-        String jsonStr = JSONObject.toJSONString(map);
-        try {
-            //使用公钥加密
-            String encryptStr = RSA.encryptPub(jsonStr,pk);
-            JSONObject mapParam = new JSONObject();
-            mapParam.put("outMemberNo",memberNo);
-            mapParam.put("signType","RSA");
-            mapParam.put("sign",encryptStr);
-            logger.info("单笔请求请求参数：{}",JSONObject.toJSONString(mapParam));
-            return JSONObject.toJSONString(mapParam);
-        } catch (Exception e) {
-            logger.info("加密/发送失败：{}",e);
-        }
-        return null;
-    }
-
-    public static String doPost(String url, String json) {
-        CloseableHttpClient httpclient = HttpClientBuilder.create().build();
-        HttpPost post = new HttpPost(url);
-        HttpGet get = new HttpGet(url);
-
-        String response = null;
-        try {
-            StringEntity s = new StringEntity(json,"UTF-8");
-//			s.setContentEncoding("UTF-8");
-            // 发送json数据需要设置contentType
-            s.setContentType("application/json");
-            post.setEntity(s);
-            HttpResponse res = httpclient.execute(post);
-            if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-                response = EntityUtils.toString(res.getEntity());// 返回json格式：
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return response;
-    }
 }