Merge remote-tracking branch 'origin/master'

cgf

2025-09-10 76088a1a46cbbc05fc92ad8d982b0dcb0da87cb2

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

@@ -151,6 +151,9 @@
        double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), paymentOrderDto.getMoney());
        //添加或更新支付记录(参数跟进自己业务需求添加)

//        String orderPre = smallWeChatDto.getOrderPre();
//        paymentOrderDto.setOrderId(orderPre + paymentOrderDto.getOrderId());

        JSONObject resMap = null;
        if (TRADE_TYPE_LETPAY.equals(tradeType)){
            resMap = this.java110UnifieldOrder(paymentOrderDto.getName(),
@@ -218,16 +221,15 @@
            feeName = feeName.substring(0, 126);
        }
//        String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
        String orderPre = smallWeChatDto.getOrderPre();
        JSONObject paramMap = new JSONObject();
        if (tradeType == null){
            paramMap.put("version", VERSION);
            paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
            paramMap.put("random_str", PayUtil.makeUUID(32));
            paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount));
            paramMap.put("mchnt_order_no", orderPre + orderNum);
            paramMap.put("mchnt_order_no", orderNum);
            paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
            paramMap.put("goods_des", "cesdasw");
            paramMap.put("goods_des", feeName);
            paramMap.put("term_id", "abcdefgh");
            paramMap.put("term_ip", PayUtil.getLocalIp());
            paramMap.put("notify_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
@@ -254,9 +256,9 @@
        paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
        paramMap.put("random_str", PayUtil.makeUUID(32));
        paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount));
        paramMap.put("mchnt_order_no", orderPre + orderNum);
        paramMap.put("mchnt_order_no", orderNum);
        paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
        paramMap.put("goods_des", "cesdasw");
        paramMap.put("goods_des", feeName);
        paramMap.put("term_id", "abcdefgh");
        paramMap.put("term_ip", PayUtil.getLocalIp());
        paramMap.put("notify_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));