44323
2024-01-29 ce166b832f583e9d6840601c000242e5676297f8
11.27,9
4个文件已修改
43 ■■■■■ 已修改文件
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -960,6 +960,8 @@
        String smid1="";
        if (store.getOperatorId() == null ){
            smid1 = smid;
        }else if (store.getOperatorId() == 0){
            smid1 = smid;
        }else{
            smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
        }
@@ -1006,9 +1008,11 @@
                                        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
                                        TCoursePackage byId = coursePackageService.getById(coursePackageId);
                                        Store store = storeClient.queryStoreById(byId.getStoreId());
                                        if (store.getOperatorId()== null ){
                                        if (store.getOperatorId() == null ){
                                            // 说明是平台的门店
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
                                        }else if (store.getOperatorId() == 0){
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
                                        }else{
                                            String smid = storeClient.getSMIDByOperatorId(store.getOperatorId());
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1088,10 +1088,14 @@
        Integer coursePackageId = paymentCourseVo.getId();
        TCoursePackage byId = coursePackageService.getById(coursePackageId);
        Store store = storeClient.queryStoreById(byId.getStoreId());
        if (store.getOperatorId() == null ){
        if (store.getOperatorId() == null){
            smid1 = smid;
        }else{
            smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
            if (store.getOperatorId()==0){
                smid1 = smid;
            }else{
                smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
            }
        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
                coursePackagePaymentConfig.getId().toString(),
@@ -1149,6 +1153,11 @@
                                            // 说明是平台的
                                            payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
                                        break;
                                    }else if (operatorId==0){
                                        String smid ="2088330203191220";
                                        // 说明是平台的
                                        payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
                                        break;
                                    }else{
                                        // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
                                        String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -61,6 +61,8 @@
    @Autowired
    private ISiteBookingService siteBookingService;
    @Autowired
    private IOperatorUserService operatorUserService;
    @ResponseBody
    @PostMapping("/getIntro")
@@ -264,7 +266,22 @@
                return weixinpay;
            } else if (type == 2) {
                String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId + "_" + code + "_" + configId;
                ResultUtil alipay = payMoneyUtil.alipay("游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
                TGame byId = gameService.getById(gameId);
                String smid="";
                // 属于平台
                if (byId.getOperationId()==null){
                    smid ="2088330203191220";
                }else if(byId.getOperationId()==0){
                    smid= "2088330203191220";
                }else{
                    // 根据运营商id 查询商户号
                    OperatorUser operatorId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
                            .eq("operatorId", byId.getOperationId()));
                    if (operatorId!=null){
                        smid = operatorId.getAlipayNum();
                    }
                }
                ResultUtil alipay = payMoneyUtil.alipay(smid,"游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
                if (alipay.getCode() == 200) {
                    new Thread(new Runnable() {
                        @Override
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -541,8 +541,11 @@
        if (operatorId == null ){
            // 平台的门店
            smid1 = smid;
        }else if (operatorId == 0){
            smid1 = smid;
        }else{
            smid1 = siteService.getSMIDByOperatorId(operatorId);
        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        System.out.println("预约场地----" + alipay.getCode());
@@ -590,9 +593,11 @@
                                    String smid1 = "";
                                    if (operatorId == null ){
                                        // 平台的门店
                                    }else if (operatorId == 0){
                                        smid1 = smid;
                                    }else{
                                        smid1 = siteService.getSMIDByOperatorId(operatorId);
                                    }
                                    payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
                                    break;