1

zj

2025-08-01 c083117c831581463dbc4ef3840fc934796e173e

1

 src/main/java/com/nq/controller/protol/UserPayController.java

@@ -50,12 +50,9 @@

    @RequestMapping({"flyPay.do"})
    @ResponseBody
    public ServerResponse flyPay(@RequestParam("payTypeId") Integer payType,
                                 @RequestParam("payAmt") String payAmt,
                                 @RequestParam("img") String currency,
    public ServerResponse flyPay(@RequestParam("payAmt") String payAmt,
                                 HttpServletRequest request) {
        log.info("发起 fly 线上支付 payType = {} payAmt = {} currency = {}", new Object[]{payType, payAmt, currency});
        return this.iPayService.flyPay(payType, payAmt, currency, request);
        return this.iPayService.flyPay(payAmt,request);
    }



 src/main/java/com/nq/pojo/UserRecharge.java

@@ -58,6 +58,4 @@





}

 src/main/java/com/nq/service/IPayService.java

@@ -4,6 +4,7 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.PaymentResponse;
import com.nq.pojo.RechargeCallbackVo;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -21,7 +22,8 @@

  ServerResponse juhenewpayNotify(HttpServletRequest paramHttpServletRequest) throws UnsupportedEncodingException;

  ServerResponse flyPay(Integer paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest);
  ServerResponse flyPay(String payAmt,
                        HttpServletRequest request);
  
  ServerResponse flyNotify(HttpServletRequest paramHttpServletRequest) throws IOException;


 src/main/java/com/nq/service/impl/PayServiceImpl.java

@@ -390,23 +390,20 @@


    @Transactional
    public ServerResponse flyPay(Integer payType, String payAmt, String currency, HttpServletRequest request) {
    public ServerResponse flyPay(String payAmt,  HttpServletRequest request) {
        User user = iUserService.getCurrentUser(request);
        SitePay sitePay  = sitePayMapper.selectById(payType);
        UserRecharge userRecharge = new UserRecharge();
        userRecharge.setUserId(user.getId());
        userRecharge.setNickName(user.getRealName());
        userRecharge.setAgentId(user.getAgentId());
        String ordersn = KeyUtils.getRechargeOrderSn();
        userRecharge.setOrderSn(ordersn);
        userRecharge.setPayChannel(sitePay.getChannelName());
        userRecharge.setPayChannel("联系客服充值");
        userRecharge.setPayAmt(new BigDecimal(payAmt));
        userRecharge.setOrderStatus(Integer.valueOf(0));
        userRecharge.setAddTime(new Date());
        userRecharge.setPayId(payType);
        userRecharge.setImg(currency);
        userRechargeMapper.insert(userRecharge);
        return ServerResponse.createBySuccess( ((SiteInfo)siteInfoService.getInfo(request).getData()).getOnlineService());
        return ServerResponse.createBySuccess();
    }



 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java

@@ -307,8 +307,7 @@
            if (user == null) {
                return ServerResponse.createByErrorMsg("用户不存在");
            }
            SitePay payChnnel = sitePayMapper.selectById(userRecharge.getPayId());
            userAssetsServices.availablebalanceChange(payChnnel.getAssetsType(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
            userAssetsServices.availablebalanceChange(EStockType.JP.getCode(), user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
        }
        userRecharge.setOrderStatus(Integer.valueOf((state.intValue() == 1) ? 1 : 2));
        userRecharge.setPayTime(new Date());

 src/main/resources/mapper/UserRechargeMapper.xml

@@ -215,10 +215,8 @@
  <select id="listByAdmin" parameterType="map" resultType="com.nq.pojo.UserRecharge">
    SELECT
    s.id, s.user_id, s.nick_name, s.agent_id, s.order_sn, s.pay_sn, s.pay_channel,
    s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img ,p.channel_name,p.assets_type
    s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img
    FROM user_recharge s
    join site_pay p
    on s.pay_id = p.id
    where  1=1
    <if test="agentId != null and agentId != ''">
      and ( agent_id = #{agentId}