Sfoglia il codice sorgente

fix : 代码合并提交

bilingfeng 1 anno fa
parent
commit
3221661b5e

+ 0 - 6
game-module/game-module-manage/pom.xml

@@ -97,12 +97,6 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metadata-definition-protobuf</artifactId>
         </dependency>
-        <!-- 头条回传api -->
-        <dependency>
-            <groupId>com.zanxiang.advertising.oceanengine</groupId>
-            <artifactId>advertising-oceanengine-track-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- 腾讯广告服务 -->
         <dependency>
             <groupId>com.zanxiang.advertising.tencent</groupId>

+ 2 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameAppletController.java

@@ -48,7 +48,7 @@ public class GameAppletController {
     @GetMapping(value = "/qr/code")
     @PreAuthorize(permissionKey = "sdk:gameApplet:qrCode")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
-    public ResultVO<String> getQrCode(@RequestParam Long gameId) {
-        return ResultVO.ok(gameAppletService.getQrCod(gameId));
+    public ResultVO<String> getQrCodByGameId(@RequestParam Long gameId) {
+        return ResultVO.ok(gameAppletService.getQrCodByGameId(gameId));
     }
 }

+ 4 - 9
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/OrderController.java

@@ -15,7 +15,10 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-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 : lingfeng
@@ -48,12 +51,4 @@ public class OrderController {
     public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody LogPayCpParam param) {
         return ResultVO.ok(logPayCpService.callCpList(param));
     }
-
-    @ApiOperation(value = "订单上报")
-    @PutMapping(value = "/call/back")
-    @PreAuthorize(permissionKey = "sdk:order:callBack")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> callBack(@RequestParam String orderId) {
-        return ResultVO.ok(orderService.callBack(orderId));
-    }
 }

+ 11 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameAppletService.java

@@ -43,5 +43,15 @@ public interface IGameAppletService extends IService<GameApplet> {
      * @param gameId : 游戏id
      * @return {@link String}
      */
-    String getQrCod(Long gameId);
+    String getQrCodByGameId(Long gameId);
+
+    /**
+     * 获取小游戏二维码
+     *
+     * @param appId       应用程序id
+     * @param appSecret   应用程序秘密
+     * @param ossFileName oss文件名
+     * @return {@link String}
+     */
+    String getQrCode(String appId, String appSecret, String ossFileName);
 }

+ 0 - 8
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IOrderService.java

@@ -15,14 +15,6 @@ import com.zanxiang.game.module.mybatis.entity.Order;
  */
 public interface IOrderService extends IService<Order> {
 
-    /**
-     * 订单上报
-     *
-     * @param orderId : 订单id
-     * @return {@link Boolean}
-     */
-    Boolean callBack(String orderId);
-
     /**
      * 获取用户下单记录
      *

+ 0 - 127
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/api/MiniAppletApiService.java

@@ -1,127 +0,0 @@
-package com.zanxiang.game.module.manage.service.api;
-
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import com.zanxiang.module.oss.service.IOssService;
-import com.zanxiang.module.util.JsonUtil;
-import com.zanxiang.module.util.URIUtil;
-import com.zanxiang.module.util.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.BufferedInputStream;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-13
- * @description : 微信小程序相关接口
- */
-@Slf4j
-@Service
-public class MiniAppletApiService {
-
-    @Autowired
-    private IOssService ossService;
-
-    /**
-     * 获取游戏小程序二维码
-     *
-     * @param appId       : 小程序appId
-     * @param appSecret   : 小程序密钥
-     * @param ossFileName : oss文件名
-     * @return : 返回oss二维码图片地址
-     */
-    public String getQrCode(String appId, String appSecret, String ossFileName) {
-        if (Strings.isBlank(appId) || Strings.isBlank(appSecret)) {
-            throw new BaseException("参数错误, 缺少小程序信息");
-        }
-        //oss文件名
-        ossFileName = Strings.isBlank(ossFileName) ? UUID.randomUUID().toString() + ".jpg" : ossFileName + ".jpg";
-        //获取小程序token
-        String token = this.getAppletTokenApi(appId, appSecret);
-        //获取小程序二维码
-        BufferedInputStream inputStream = this.getQrCodeApi(null, token);
-        //二维码上传到oss, 返回网络地址
-        return ossService.upload(ossFileName, inputStream);
-    }
-
-    /**
-     * 获取小程序token
-     *
-     * @param appId  : 小程序appId
-     * @param secret : 小程序密钥
-     * @return : 返回小程token
-     */
-    private String getAppletTokenApi(String appId, String secret) {
-        Map<String, String> paramMap = new HashMap<>(3);
-        paramMap.put("grant_type", "client_credential");
-        paramMap.put("appid", appId);
-        paramMap.put("secret", secret);
-        String url = "https://api.weixin.qq.com/cgi-bin/token";
-        //拼接url请求参数
-        String uri = URIUtil.fillUrlParams(url, paramMap, Boolean.TRUE);
-        // 带参GET请求
-        Map<String, String> resultMap = new HashMap<>(4);
-        try {
-            String result = HttpUtil.get(uri);
-            if (Strings.isNotBlank(result)) {
-                resultMap = JsonUtil.toMap(result, Map.class, String.class, String.class);
-            }
-        } catch (Exception e) {
-            log.error("获取小程序token出现异常, appId : {},secret: {} e : {}", appId, secret, e.getMessage());
-            throw new BaseException("获取小程序token出现异常");
-        }
-        //返回token
-        if (resultMap.containsKey("access_token")) {
-            return resultMap.get("access_token");
-        }
-        //没有拿到token
-        log.error("获取token发生错误, appId : {}, secret: {}, errcode : {}, errmsg : {}", appId, secret,
-                resultMap.get("errcode"), resultMap.get("errmsg"));
-        throw new BaseException("http状态正确, 获取token发生错误");
-    }
-
-    /**
-     * 生成微信小程序二维码
-     *
-     * @param scene       : 二维码携带的参数
-     * @param accessToken : 小程序密钥
-     * @return : 返回二维码文件流
-     */
-    private BufferedInputStream getQrCodeApi(String scene, String accessToken) {
-        try {
-            //调用微信接口生成二维码
-            URL url = new URL("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("POST");
-            //连接超时 单位毫秒
-            connection.setConnectTimeout(10000);
-            //读取超时 单位毫秒
-            connection.setReadTimeout(2000);
-            // 发送POST请求必须设置如下两行
-            connection.setDoOutput(true);
-            connection.setDoInput(true);
-            // 获取URLConnection对象对应的输出流
-            PrintWriter printWriter = new PrintWriter(connection.getOutputStream());
-            // 发送请求参数
-            JSONObject paramJson = new JSONObject();
-            //这就是你二维码里携带的参数 String型  名称不可变
-            paramJson.set("scene", Strings.isBlank(scene) ? "a=1" : scene);
-            printWriter.write(paramJson.toString());
-            // flush输出流的缓冲
-            printWriter.flush();
-            //返回数据流
-            return new BufferedInputStream(connection.getInputStream());
-        } catch (Exception e) {
-            throw new BaseException("获取小程序二维码异常");
-        }
-    }
-}

+ 5 - 12
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AgentServiceImpl.java

@@ -8,7 +8,6 @@ import com.zanxiang.advertising.tencent.base.pojo.vo.UserActionSetRpcVO;
 import com.zanxiang.advertising.tencent.base.rpc.IAdAccountRpc;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.StringUtils;
 import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
 import com.zanxiang.game.module.manage.pojo.dto.AgentListDTO;
 import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
@@ -17,27 +16,20 @@ import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
 import com.zanxiang.game.module.manage.service.IAgentService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.mybatis.entity.Agent;
-import com.zanxiang.game.module.mybatis.entity.Game;
 import com.zanxiang.game.module.mybatis.mapper.AgentMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -54,7 +46,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent>
 
     public IPage<AgentVO> listOfPage(AgentListDTO dto) {
         IPage<Agent> agentIPage = page(dto.toPage(), new LambdaQueryWrapper<Agent>()
-                .like(StringUtils.isNotEmpty(dto.getAgentName()), Agent::getAgentName, dto.getAgentName())
+                .like(Strings.isNotBlank(dto.getAgentName()), Agent::getAgentName, dto.getAgentName())
                 .eq(dto.getAccountType() != null, Agent::getAccountType, dto.getAccountType())
                 .eq(dto.getAccountId() != null, Agent::getAccountId, dto.getAccountId())
                 .eq(dto.getGameId() != null, Agent::getGameId, dto.getGameId())
@@ -64,6 +56,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent>
                 .le(dto.getCreateEndTime() != null, Agent::getCreateTime, dto.getCreateEndTime() == null ? null : LocalDateTime.of(dto.getCreateEndTime(), LocalTime.MIDNIGHT))
                 .orderByDesc(Agent::getCreateTime)
         );
+        return null;
     }
 
     @Override
@@ -107,7 +100,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent>
         });
         Map<Long, UserActionSetRpcVO> userActionSetMap = new HashMap<>(0);
         if (CollectionUtils.isNotEmpty(txAccountIds)) {
-            for(Long txAccountId : txAccountIds) {
+            for (Long txAccountId : txAccountIds) {
                 userActionSetMap = userActionSetRpc.getByAccount(txAccountId).getData();
             }
         }

+ 111 - 5
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAppletServiceImpl.java

@@ -1,5 +1,7 @@
 package com.zanxiang.game.module.manage.service.impl;
 
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.utils.BeanUtils;
@@ -9,9 +11,11 @@ import com.zanxiang.game.module.manage.pojo.params.GameAccountUpdateParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameAccountVO;
 import com.zanxiang.game.module.manage.service.IGameAppletService;
 import com.zanxiang.game.module.manage.service.IGameService;
-import com.zanxiang.game.module.manage.service.api.MiniAppletApiService;
 import com.zanxiang.game.module.mybatis.entity.GameApplet;
 import com.zanxiang.game.module.mybatis.mapper.GameAppletMapper;
+import com.zanxiang.module.oss.service.IOssService;
+import com.zanxiang.module.util.JsonUtil;
+import com.zanxiang.module.util.URIUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +23,14 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.BufferedInputStream;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author : lingfeng
@@ -31,10 +42,10 @@ import java.time.LocalDateTime;
 public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApplet> implements IGameAppletService {
 
     @Autowired
-    private MiniAppletApiService miniAppletApiService;
+    private IGameService gameService;
 
     @Autowired
-    private IGameService gameService;
+    private IOssService ossService;
 
     @Override
     public GameAppletDTO getByGameId(Long gameId) {
@@ -80,7 +91,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
     }
 
     @Override
-    public String getQrCod(Long gameId) {
+    public String getQrCodByGameId(Long gameId) {
         GameDTO gameDTO = gameService.getById(gameId);
         if (gameDTO == null) {
             throw new BaseException("游戏不存在");
@@ -89,6 +100,101 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         if (gameApplet == null || Strings.isBlank(gameApplet.getAppId()) || Strings.isBlank(gameApplet.getAppSecret())) {
             throw new BaseException("该游戏未设置小程序信息");
         }
-        return miniAppletApiService.getQrCode(gameApplet.getAppId(), gameApplet.getAppSecret(), gameDTO.getName());
+        return this.getQrCode(gameApplet.getAppId(), gameApplet.getAppSecret(), gameDTO.getName());
+    }
+
+    /**
+     * 获取游戏小程序二维码
+     *
+     * @param appId       : 小程序appId
+     * @param appSecret   : 小程序密钥
+     * @param ossFileName : oss文件名
+     * @return : 返回oss二维码图片地址
+     */
+    @Override
+    public String getQrCode(String appId, String appSecret, String ossFileName) {
+        if (Strings.isBlank(appId) || Strings.isBlank(appSecret)) {
+            throw new BaseException("参数错误, 缺少小程序信息");
+        }
+        //oss文件名
+        ossFileName = Strings.isBlank(ossFileName) ? UUID.randomUUID().toString() + ".jpg" : ossFileName + ".jpg";
+        //获取小程序token
+        String token = this.getAppletTokenApi(appId, appSecret);
+        //获取小程序二维码
+        BufferedInputStream inputStream = this.getQrCodeApi(null, token);
+        //二维码上传到oss, 返回网络地址
+        return ossService.upload(ossFileName, inputStream);
+    }
+
+    /**
+     * 获取小程序token
+     *
+     * @param appId  : 小程序appId
+     * @param secret : 小程序密钥
+     * @return : 返回小程token
+     */
+    private String getAppletTokenApi(String appId, String secret) {
+        Map<String, String> paramMap = new HashMap<>(3);
+        paramMap.put("grant_type", "client_credential");
+        paramMap.put("appid", appId);
+        paramMap.put("secret", secret);
+        String url = "https://api.weixin.qq.com/cgi-bin/token";
+        //拼接url请求参数
+        String uri = URIUtil.fillUrlParams(url, paramMap, Boolean.TRUE);
+        // 带参GET请求
+        Map<String, String> resultMap = new HashMap<>(4);
+        try {
+            String result = HttpUtil.get(uri);
+            if (Strings.isNotBlank(result)) {
+                resultMap = JsonUtil.toMap(result, Map.class, String.class, String.class);
+            }
+        } catch (Exception e) {
+            log.error("获取小程序token出现异常, appId : {},secret: {} e : {}", appId, secret, e.getMessage());
+            throw new BaseException("获取小程序token出现异常");
+        }
+        //返回token
+        if (resultMap.containsKey("access_token")) {
+            return resultMap.get("access_token");
+        }
+        //没有拿到token
+        log.error("获取token发生错误, appId : {}, secret: {}, errcode : {}, errmsg : {}", appId, secret,
+                resultMap.get("errcode"), resultMap.get("errmsg"));
+        throw new BaseException("http状态正确, 获取token发生错误");
+    }
+
+    /**
+     * 生成微信小程序二维码
+     *
+     * @param scene       : 二维码携带的参数
+     * @param accessToken : 小程序密钥
+     * @return : 返回二维码文件流
+     */
+    private BufferedInputStream getQrCodeApi(String scene, String accessToken) {
+        try {
+            //调用微信接口生成二维码
+            URL url = new URL("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken);
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            //连接超时 单位毫秒
+            connection.setConnectTimeout(10000);
+            //读取超时 单位毫秒
+            connection.setReadTimeout(2000);
+            // 发送POST请求必须设置如下两行
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            // 获取URLConnection对象对应的输出流
+            PrintWriter printWriter = new PrintWriter(connection.getOutputStream());
+            // 发送请求参数
+            JSONObject paramJson = new JSONObject();
+            //这就是你二维码里携带的参数 String型  名称不可变
+            paramJson.set("scene", Strings.isBlank(scene) ? "a=1" : scene);
+            printWriter.write(paramJson.toString());
+            // flush输出流的缓冲
+            printWriter.flush();
+            //返回数据流
+            return new BufferedInputStream(connection.getInputStream());
+        } catch (Exception e) {
+            throw new BaseException("获取小程序二维码异常");
+        }
     }
 }

+ 0 - 61
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/OrderServiceImpl.java

@@ -2,16 +2,9 @@ package com.zanxiang.game.module.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.advertising.oceanengine.track.base.pojo.PlatformServer;
-import com.zanxiang.advertising.oceanengine.track.base.pojo.dto.AppOrderRpcDTO;
-import com.zanxiang.advertising.oceanengine.track.base.pojo.rpc.IAppOrderRpc;
-import com.zanxiang.advertising.oceanengine.track.base.pojo.vo.AppReportLogRpcVO;
-import com.zanxiang.game.module.base.enums.CallBackEnum;
-import com.zanxiang.game.module.base.enums.PayWayEnum;
 import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.OrderParam;
@@ -22,11 +15,7 @@ import com.zanxiang.game.module.manage.pojo.vo.UserOrderListVO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
-import com.zanxiang.module.util.JsonUtil;
-import com.zanxiang.module.util.exception.BaseException;
-import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -70,59 +59,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IPayWayService payWayService;
 
-    @Autowired
-    private IOrderService orderService;
-
     @Autowired
     private IPayDeviceService payDeviceService;
 
-    @DubboReference(providedBy = PlatformServer.SERVER_DUBBO_NAME)
-    private IAppOrderRpc appOrderRpc;
-
-    @Override
-    public Boolean callBack(String orderId) {
-        Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId, orderId));
-        if (order == null) {
-            throw new BaseException("参数错误, 订单信息不存在");
-        }
-        if (Objects.equals(order.getCallBackStatus(), CallBackEnum.SUCCESS_CALL_BACK.getCallBackStatus())) {
-            throw new BaseException("订单已经上报, 请勿重复操作");
-        }
-        AppOrderRpcDTO dto = AppOrderRpcDTO.builder()
-                .appKey(String.valueOf(order.getGameId()))
-                .orderId(order.getOrderId())
-                .userId(String.valueOf(order.getUserId()))
-                .amount(order.getAmount().multiply(new BigDecimal("100")).longValue())
-                .realAmount(order.getRealAmount().multiply(new BigDecimal("100")).longValue())
-                .tranNo(order.getMerchantOrderNo())
-                .orderStatus(order.getStatus())
-                .payType(PayWayEnum.getByPayType(order.getPayWayId()))
-                .payTime(order.getPayTime())
-                .createTime(order.getCreateTime())
-                .build();
-        //调接口
-        ResultVO<AppReportLogRpcVO> result;
-        try {
-            result = appOrderRpc.order(dto);
-        } catch (Exception e) {
-            log.error("订单回传上报异常, order : {}, e : {}", JsonUtil.toString(order), e.getMessage());
-            throw new BaseException("订单回传上报异常");
-        }
-        log.error("订单回传结果, orderId : {}, result : {}", order.getOrderId(), JsonUtil.toString(result));
-        String adId = "AD_ID";
-        Integer callBackStatus = CallBackEnum.FAIL_CALL_BACK.getCallBackStatus();
-        //成功
-        if (result.isSuccess() && result.getData() != null && result.getData().getAid() != null) {
-            adId = result.getData().getAid().toString();
-            callBackStatus = CallBackEnum.SUCCESS_CALL_BACK.getCallBackStatus();
-        }
-        //更新数据库
-        return orderService.update(new LambdaUpdateWrapper<Order>()
-                .set(Order::getAdId, adId)
-                .set(Order::getCallBackStatus, callBackStatus)
-                .eq(Order::getOrderId, order.getOrderId()));
-    }
-
     @Override
     public IPage<UserOrderListVO> orderList(UserOrderListParam param) {
         //执行查询

+ 3 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/PayApplicationServiceImpl.java

@@ -13,8 +13,8 @@ import com.zanxiang.game.module.manage.pojo.params.PayApplicationAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.PayApplicationListParam;
 import com.zanxiang.game.module.manage.pojo.vo.PayApplicationChoiceVO;
 import com.zanxiang.game.module.manage.pojo.vo.PayApplicationVO;
+import com.zanxiang.game.module.manage.service.IGameAppletService;
 import com.zanxiang.game.module.manage.service.IPayApplicationService;
-import com.zanxiang.game.module.manage.service.api.MiniAppletApiService;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;
 import com.zanxiang.game.module.mybatis.mapper.PayApplicationMapper;
 import com.zanxiang.module.util.exception.BaseException;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper, PayApplication> implements IPayApplicationService {
 
     @Autowired
-    private MiniAppletApiService miniAppletApiService;
+    private IGameAppletService gameAppletService;
 
     @Override
     public List<PayApplicationChoiceVO> payApplicationChoiceList() {
@@ -146,7 +146,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (Objects.equals(payApplication.getType(), PayApplicationTypeEnum.ALI_PAY_APP.getType())) {
             throw new BaseException("支付宝应用不支持生成小程序码!");
         }
-        return miniAppletApiService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getAppName());
+        return gameAppletService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getAppName());
     }
 
     @Override