feat : 代码修改整理提交

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/TestController.java

@@ -1,11 +1,14 @@
 package com.zanxiang.sdk.controller;
 
+import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.sdk.annotation.UnSignCheck;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
+import com.zanxiang.sdk.domain.params.ProductPayParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.GameShareVO;
+import com.zanxiang.sdk.service.IOrderPayService;
 import com.zanxiang.sdk.service.IOrderService;
-import com.zanxiang.sdk.service.IPayApplicationService;
 import com.zanxiang.sdk.service.pay.WxPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiResponse;
@@ -25,15 +28,15 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/api/test")
 public class TestController {
 
-    @Autowired
-    private IPayApplicationService payApplicationService;
-
     @Autowired
     private WxPayService wxPayService;
 
     @Autowired
     private IOrderService orderService;
 
+    @Autowired
+    private IOrderPayService orderPayService;
+
     @UnSignCheck
     @GetMapping("/close/order")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameShareVO.class)})
@@ -42,4 +45,20 @@ public class TestController {
         wxPayService.closeOrder(platformOrderDTO);
         return ResultVO.ok();
     }
+
+    @UnSignCheck
+    @GetMapping("/pay/order")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameShareVO.class)})
+    public ResultVO payOrder() {
+        String param = "{\"payWay\":1,\"payDevice\":2,\"productId\":\"0.1元\",\"productName\":\"1元宝\",\"productDesc\":\"充值1元购买100元宝\",\"amount\":0.1,\"serverId\":\"2\",\"serverName\":\"二区\",\"roleId\":\"132\",\"roleName\":\"oHaTi5bsKYQKlbWEHcfr7UWk_Wtk\",\"roleLevel\":1,\"extension\":\"\"}";
+        ProductPayParam productPayParam = JsonUtil.toObj(param, ProductPayParam.class);
+        UserData userData = UserData.builder()
+                .gameId(21L)
+                .userId(132L)
+                .deviceSystem("ios")
+                .ip("125.121.234.254")
+                .build();
+        orderPayService.payCreate(productPayParam, userData);
+        return ResultVO.ok();
+    }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/bo/ProductPayParamBO.java

@@ -57,11 +57,6 @@ public class ProductPayParamBO {
      */
     private String spbillCreateIp;
 
-    /**
-     * 附件数据主要用于商户携带订单的自定义数据
-     */
-    private ProductPayAttachParamBO attach;
-
     /**
      * 支付类型, 1:PC, 2: h5支付, 3: App支付, 4: 小程序支付, 5: 米大师支付, 6:客服支付
      */

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/pay/PayBaseService.java

@@ -76,7 +76,6 @@ public abstract class PayBaseService {
             attachBO.setOrderId(product.getOutTradeNo());
             attachBO.setPayWay(product.getPayWay());
             attachBO.setGamePayWayId(gamePayWayDTO.getId());
-//            product.setAttach(attachBO);
             this.attach = attachBO;
             return this.create(product, gamePayWayDTO);
         } catch (Exception e) {

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/pay/WxPayService.java

@@ -44,8 +44,9 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * @author xufeng
- * @date 2022/6/8 15:37
+ * @author : lingfeng
+ * @time : 2022-09-28
+ * @description : 支付超类
  */
 @Slf4j
 @Service
@@ -103,10 +104,6 @@ public class WxPayService extends PayBaseService {
 
     @Override
     public Map<String, Object> create(ProductPayParamBO product, GamePayWayDTO gamePayWayDTO) {
-//        this.attach = product.getAttach();
-//        this.attach.setGamePayWayId(gamePayWayDTO.getId());
-
-        log.error("微信支付, attach : {}", JsonUtil.toString(this.attach));
         //初始化配置
         this.configInit(gamePayWayDTO);
         //支付方式