暂存0829

chengf

2025-08-29 fef2c4d637ca36cd8379b98d1e54d68a7a0536b0

 service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java

@@ -118,25 +118,25 @@

        String openId = reqJson.getString("openId");

        if(StringUtil.isEmpty(openId)) {
            //由于现在只有006，所以写死WECHAT，后续如果有多种支付方式则重新设计
//            String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
//            if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
//                appType = OwnerAppUserDto.APP_TYPE_WECHAT;
//            } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) {
//                appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
//            } else {
//                appType = OwnerAppUserDto.APP_TYPE_APP;
//            }
            String appType = OwnerAppUserDto.APP_TYPE_WECHAT;
            OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
            ownerAppUserDto.setUserId(userId);
            ownerAppUserDto.setAppType(appType);
            List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);

            Assert.listOnlyOne(ownerAppUserDtos, "未找到开放账号信息");
            openId = ownerAppUserDtos.get(0).getOpenId();
        }
//        if(StringUtil.isEmpty(openId)) {
//            //由于现在只有006，所以写死WECHAT，后续如果有多种支付方式则重新设计
////            String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
////            if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
////                appType = OwnerAppUserDto.APP_TYPE_WECHAT;
////            } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) {
////                appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
////            } else {
////                appType = OwnerAppUserDto.APP_TYPE_APP;
////            }
//            String appType = OwnerAppUserDto.APP_TYPE_WECHAT;
//            OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
//            ownerAppUserDto.setUserId(userId);
//            ownerAppUserDto.setAppType(appType);
//            List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
//
//            Assert.listOnlyOne(ownerAppUserDtos, "未找到开放账号信息");
//            openId = ownerAppUserDtos.get(0).getOpenId();
//        }


        logger.debug("【小程序支付】 统一下单开始, 订单编号=" + paymentOrderDto.getOrderId());
@@ -199,7 +199,8 @@
        paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
        paramMap.put("order_type", "WECHAT");
//        paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount));
        paramMap.put("order_amt", (int)(payAmount*100));
//        paramMap.put("order_amt", (int)(payAmount*100));
        paramMap.put("order_amt", 1);
        paramMap.put("mchnt_order_no", orderPre + orderNum);
        paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
        paramMap.put("goods_des", feeName);
@@ -209,7 +210,7 @@
        paramMap.put("random_str", PayUtil.makeUUID(32));
        paramMap.put("version", VERSION);
        paramMap.put("trade_type", tradeType);
        paramMap.put("sub_openid", openid);
//        paramMap.put("sub_openid", openid);
        paramMap.put("sub_appid", smallWeChatDto.getAppId());
        paramMap.put("sign", createSign(paramMap, smallWeChatDto.getAppSecret()));