微调

semiconductor-system/src/main/java/com/system/controller/DockingController.java

 package com.system.controller;
 
 import com.system.serivce.IDockingService;
-import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
-import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
-import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
+import com.system.transfer.docking.*;
 import com.system.transfer.response.RestResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Inori
@@ -27,16 +28,28 @@ public class DockingController {
     }
 
     @ApiOperation("分销会员创建")
-    @GetMapping("/docking/distribution/member/subordinate/list")
+    @PostMapping("/docking/distribution/transaction/create")
+    public RestResponse dockingDistributionTransactionCreate(@RequestBody DockingDistributionTransactionCreateInVo inVo) {
+        return dockingService.dockingDistributionTransactionCreate(inVo);
+    }
+
+    @ApiOperation("分销会员下级查询")
+    @PostMapping("/docking/distribution/member/subordinate/list")
     public RestResponse dockingDistributionMemberSubordinateList(@RequestBody DockingDistributionMemberSubordinateListInVo inVo) {
         return dockingService.dockingDistributionMemberSubordinateList(inVo);
     }
 
     @ApiOperation("分销会员余额")
-    @GetMapping("/docking/distribution/member/balance")
+    @PostMapping("/docking/distribution/member/balance")
     public RestResponse dockingDistributionMemberBalance(@RequestBody DockingDistributionMemberBalanceInVo inVo) {
         return dockingService.dockingDistributionMemberBalance(inVo);
     }
 
+    @ApiOperation("分销会员收益")
+    @PostMapping("/docking/distribution/member/profit")
+    public RestResponse dockingDistributionMemberProfit(@RequestBody DockingDistributionMemberProfitInVo inVo) {
+        return dockingService.dockingDistributionMemberProfit(inVo);
+    }
+
 
 }

semiconductor-system/src/main/java/com/system/quartz/job/SynchronizationJob.java

@@ -29,7 +29,7 @@ public class SynchronizationJob implements Job {
             e.printStackTrace();
         }
 
-        synchronizationService.synchronization();
+        //synchronizationService.synchronization();
     }
 
 

semiconductor-system/src/main/java/com/system/serivce/IDockingDistributionService.java

@@ -12,18 +12,20 @@ public interface IDockingDistributionService {
     /**
      * 对接分销会员创建
      *
-     * @param data    参数
      * @param queueId 唯一标识
+     * @param data    参数
      * @return 结果
      */
-    String dockingDistributionMemberCreate(Map<String, Object> data, String queueId);
+    String dockingDistributionMemberCreate(String queueId, Map<String, Object> data);
 
     /**
      * 对接订单交易创建
      *
+     * @param queueId 唯一标识
+     * @param data    参数
      * @return 结果
      */
-    RestResponse dockingDistributionTransactionCreate();
+    String dockingDistributionTransactionCreate(String queueId, Map<String, Object> data);
 
     /**
      * 对接订单提现创建
@@ -50,5 +52,14 @@ public interface IDockingDistributionService {
      */
     String dockingDistributionMemberBalance(String queueId, String memberId);
 
+    /**
+     * 会员收益
+     *
+     * @param memberId 会员标识
+     * @param queueId  唯一标识
+     * @return 结果
+     */
+    String dockingDistributionMemberProfit(String queueId, String memberId);
+
 
 }

semiconductor-system/src/main/java/com/system/serivce/IDockingService.java

 package com.system.serivce;
 
-import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
-import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
-import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
+import com.system.transfer.docking.*;
 import com.system.transfer.response.RestResponse;
 
 /**
@@ -19,6 +17,14 @@ public interface IDockingService {
     RestResponse dockingDistributionMemberCreate(DockingDistributionMemberCreateInVo inVo);
 
     /**
+     * 对接分销交易创建
+     *
+     * @param inVo 条件
+     * @return 结果
+     */
+    RestResponse dockingDistributionTransactionCreate(DockingDistributionTransactionCreateInVo inVo);
+
+    /**
      * 查询分销会员下级列表
      *
      * @param inVo 条件
@@ -27,12 +33,20 @@ public interface IDockingService {
     RestResponse dockingDistributionMemberSubordinateList(DockingDistributionMemberSubordinateListInVo inVo);
 
     /**
-     * 查询分销会员下级列表
+     * 分销会员余额
      *
      * @param inVo 条件
      * @return 结果
      */
     RestResponse dockingDistributionMemberBalance(DockingDistributionMemberBalanceInVo inVo);
 
+    /**
+     * 分销会员余额
+     *
+     * @param inVo 条件
+     * @return 结果
+     */
+    RestResponse dockingDistributionMemberProfit(DockingDistributionMemberProfitInVo inVo);
+
 
 }

semiconductor-system/src/main/java/com/system/serivce/impl/DockingDistributionServiceImpl.java

@@ -37,7 +37,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
     }
 
     @Override
-    public String dockingDistributionMemberCreate(Map<String, Object> data, String queueId) {
+    public String dockingDistributionMemberCreate(String queueId, Map<String, Object> data) {
         try {
             data.put("secret", secret);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/memberAdd", JsonUtil.toString(data));
@@ -51,24 +51,16 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
     }
 
     @Override
-    public RestResponse dockingDistributionTransactionCreate() {
+    public String dockingDistributionTransactionCreate(String queueId, Map<String, Object> data) {
         try {
-            Map<String, Object> data = new HashMap<>();
             data.put("secret", secret);
-            data.put("disSetUserId", "1111");
-            data.put("orderId", "5555");
-            data.put("disAmount", "12");
-            data.put("disNote", "");
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/trade", JsonUtil.toString(data));
 
-            Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
-            if (CollectionUtils.isEmpty(map) || !Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
-                return RestResponse.fail("新增交易失败");
-            }
-            return RestResponse.success();
+            thirdPartyLogUtil.thirdPartyLogCreate("分销交易创建", "0001", queueId, "平台->分销", JsonUtil.toString(data), result, 1);
+            return result;
         } catch (IOException e) {
             e.printStackTrace();
-            return RestResponse.fail("新增交易失败");
+            return "";
         }
     }
 
@@ -125,5 +117,21 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
         }
     }
 
+    @Override
+    public String dockingDistributionMemberProfit(String queueId, String memberId) {
+        try {
+            Map<String, Object> data = new HashMap<>(2);
+            data.put("secret", secret);
+            data.put("memberId", memberId);
+            String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/member/profit", JsonUtil.toString(data));
+
+            thirdPartyLogUtil.thirdPartyLogCreate("分销会员收益查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), result, 1);
+            return result;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
 
 }

semiconductor-system/src/main/java/com/system/serivce/impl/DockingServiceImpl.java

@@ -3,9 +3,7 @@ package com.system.serivce.impl;
 import com.system.constants.Constants;
 import com.system.serivce.IDockingDistributionService;
 import com.system.serivce.IDockingService;
-import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
-import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
-import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
+import com.system.transfer.docking.*;
 import com.system.transfer.response.RestResponse;
 import com.system.utils.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +30,12 @@ public class DockingServiceImpl implements IDockingService {
     public RestResponse dockingDistributionMemberCreate(DockingDistributionMemberCreateInVo inVo) {
         Map<String, Object> data = new HashMap<>();
         data.put("disUserId", inVo.getMemberId());
-        data.put("disUserName", inVo.getMemeberName());
+        data.put("disUserName", inVo.getMemberName());
         data.put("disParentId", inVo.getReferrerId());
         data.put("disPlatformId", inVo.getPlatformId());
         data.put("disNote", inVo.getRemark());
 
-        String result = dockingDistributionService.dockingDistributionMemberCreate(data, inVo.getQueueId());
+        String result = dockingDistributionService.dockingDistributionMemberCreate(inVo.getQueueId(), data);
         Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
         if (CollectionUtils.isEmpty(map) || !Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
             return RestResponse.fail("新增会员失败");
@@ -47,6 +45,23 @@ public class DockingServiceImpl implements IDockingService {
     }
 
     @Override
+    public RestResponse dockingDistributionTransactionCreate(DockingDistributionTransactionCreateInVo inVo) {
+        Map<String, Object> data = new HashMap<>();
+        data.put("disSetUserId", inVo.getMemberId());
+        data.put("orderId", inVo.getOrderId());
+        data.put("disNote", inVo.getRemark());
+        data.put("disAmount", inVo.getAmount());
+
+        String result = dockingDistributionService.dockingDistributionTransactionCreate(inVo.getQueueId(), data);
+        Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
+        if (CollectionUtils.isEmpty(map) || !Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
+            return RestResponse.fail("新增交易失败");
+        }
+
+        return RestResponse.success();
+    }
+
+    @Override
     public RestResponse dockingDistributionMemberSubordinateList(DockingDistributionMemberSubordinateListInVo inVo) {
         String result = dockingDistributionService.dockingDistributionMemberSubordinateList(inVo.getQueueId(), inVo.getMemberId());
 
@@ -79,5 +94,17 @@ public class DockingServiceImpl implements IDockingService {
         return RestResponse.success();
     }
 
+    @Override
+    public RestResponse dockingDistributionMemberProfit(DockingDistributionMemberProfitInVo inVo) {
+        String result = dockingDistributionService.dockingDistributionMemberProfit(inVo.getQueueId(), inVo.getMemberId());
+
+        Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
+        if (!CollectionUtils.isEmpty(map) && Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
+            return RestResponse.success(map.get("data"));
+        }
+
+        return RestResponse.success();
+    }
+
 
 }

semiconductor-system/src/main/java/com/system/serivce/impl/SynchronizationServiceImpl.java

@@ -69,7 +69,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
             }
 
             if (!CollectionUtils.isEmpty(request)) {
-                dockingDistributionService.dockingDistributionMemberCreate(request, queueId);
+                dockingDistributionService.dockingDistributionMemberCreate(queueId, request);
             }
         });
     }

semiconductor-system/src/main/java/com/system/transfer/docking/DockingDistributionMemberCreateInVo.java

@@ -23,7 +23,7 @@ public class DockingDistributionMemberCreateInVo {
     /**
      * 会员名称
      */
-    private String memeberName;
+    private String memberName;
 
 
     /**

semiconductor-system/src/main/java/com/system/transfer/docking/DockingDistributionMemberProfitInVo.java

+package com.system.transfer.docking;
+
+import lombok.Data;
+
+/**
+ * @author Inori
+ */
+@Data
+public class DockingDistributionMemberProfitInVo {
+
+    /**
+     * 唯一标识
+     */
+    private String queueId;
+
+
+    /**
+     * 会员标识
+     */
+    private String memberId;
+
+
+}

semiconductor-system/src/main/java/com/system/transfer/docking/DockingDistributionTransactionCreateInVo.java

+package com.system.transfer.docking;
+
+import lombok.Data;
+
+/**
+ * @author Inori
+ */
+@Data
+public class DockingDistributionTransactionCreateInVo {
+
+    /**
+     * 唯一标识
+     */
+    private String queueId;
+
+
+    /**
+     * 会员标识
+     */
+    private String memberId;
+
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+
+    /**
+     * 金额
+     */
+    private String amount;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}