修改支付信息

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/biz/OrderPayBiz.java

@@ -54,7 +54,7 @@ import static com.upyuns.platform.rs.universal.constant.DictionaryKey.UNIVERSAL_
  */
 @Service
 @Slf4j
-public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
+public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 
 	@Autowired
 	DictionaryBiz dictionaryBiz;
@@ -131,7 +131,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				insertSelective(orderPay);
 				log.error("---下单---order_no=====" + order_no + "----成功");
 			} catch (Exception e) {
-                log.error(e.getMessage(), e);;
+				log.error(e.getMessage(), e);
+				;
 				log.error("---下单---order_no=====" + order_no + "----异常---msg===" + e.getMessage());
 				return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
 			}
@@ -190,7 +191,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				String url = pay.getNotifyUrl();
 				Integer type = pay.getType() == null ? 1 : pay.getType();
 				Integer payWay = pay.getPayWay();
-                url += "&tradeNo=" + orderNo + "&type=" + type+"&payWay="+payWay;
+				url += "&tradeNo=" + orderNo + "&type=" + type + "&payWay=" + payWay;
 				log.error("---支付回调处理---orderNo=======" + orderNo + "----notifyUrl====" + url);
 				String result = "";
 				if (url.contains("https") || url.contains("HTTPS")) {
@@ -260,6 +261,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		}
 		return ObjectRestResponse.createDefaultFail().getMessage();
 	}
+
 	/**
 	 * 支付宝生成支付信息
 	 *
@@ -271,13 +273,15 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayClient alipayClient = getAlipayClient();
 		//实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
 		try {
-            return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
+			return preCreate(alipayClient, orderPayVo, notifyUrl);
 		} catch (Exception e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+			;
 		}
 		return null;
 	}
 
+
 	private AlipayClient getAlipayClient() {
 		AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
 				SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
@@ -320,7 +324,31 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 			log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
 			return response.getBody();
 		} catch (AlipayApiException e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+
+	/**
+	 * 扫码支付
+	 *
+	 * @return
+	 */
+	private String preCreate(AlipayClient alipayClient, OrderPayVo orderPayVo, String notifyUrl) {
+        BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest(); //创建API对应的request类
+		request.setBizContent("{" +
+				"\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"," + //商户订单号
+				"\"total_amount\":\""+realAmount+"\"," +
+				"\"subject\":\"" + orderPayVo.getSubject() + "\"," +
+				"\"timeout_express\":\"30m\"}"); //订单允许的最晚付款时间
+        try {
+            AlipayTradePrecreateResponse response = alipayClient.execute(request);
+            log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
+            return response.getBody();
+        } catch (AlipayApiException e) {
+            log.error(e.getMessage(), e);
         }
         return null;
     }
@@ -377,7 +405,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 	 * @param alipayClient
 	 * @throws AlipayApiException
 	 */
-    public String alipayfundTrans(AlipayClient alipayClient, FundPayVo fundPayVo){
+	public String alipayfundTrans(AlipayClient alipayClient, FundPayVo fundPayVo) {
 		AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();
 		request.setBizContent("{" +
 				"\"out_biz_no\":\"" + fundPayVo.getOutBizNo() + "\"," +
@@ -391,43 +419,44 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		try {
 			response = alipayClient.execute(request);
 		} catch (AlipayApiException e) {
-            throw new BaseException("支付宝转账api调用错误",e);
+			throw new BaseException("支付宝转账api调用错误", e);
 		}
 		if (response.isSuccess()) {
 			return fundPayVo.getOutBizNo();
 		} else {
-            throw  new BaseException(response.getSubMsg(),response.getSubCode());
+			throw new BaseException(response.getSubMsg(), response.getSubCode());
 		}
 	}
 
 	public String wxpayfundTrans(FundPayVo fundPayVo) {
-        Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getPayeeAccount(),fundPayVo.getOutBizNo(),fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
+		Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getPayeeAccount(), fundPayVo.getOutBizNo(), fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
 		if (SUCCESS.equals(map.get(WxResponseProperties.RETURN_CODE)) && SUCCESS.equals(map.get(WxResponseProperties.RESULT_CODE))) {
 			return map.get(WxResponseProperties.PARTNER_TRADE_NO);
 		}
-        throw new BaseException(map.get(WxResponseProperties.ERR_CODE_DES),map.get(WxResponseProperties.ERROR_CODE));
+		throw new BaseException(map.get(WxResponseProperties.ERR_CODE_DES), map.get(WxResponseProperties.ERROR_CODE));
 	}
 
 
 	/**
 	 * 支付宝授权获取用户信息
+	 *
 	 * @param code
 	 * @return
 	 * @throws AlipayApiException
 	 */
-    public String getAlipayToken(String code) throws AlipayApiException{
+	public String getAlipayToken(String code) throws AlipayApiException {
 		AlipayClient alipayClient = getAlipayClient();
 		AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
 		request.setGrantType("authorization_code");
 		request.setCode(code);
 		AlipaySystemOauthTokenResponse response = alipayClient.execute(request);
 		log.info("获取用户token调用成功,获取用户信息 {}", response.getBody());
-        if(response.isSuccess()){
+		if (response.isSuccess()) {
 			log.info("获取用户token调用成功,获取用户信息 {}", response.getBody());
-            if(response.getAccessToken() != null) {
+			if (response.getAccessToken() != null) {
 				AlipayUserInfoShareRequest alipayUserInfoShareRequest = new AlipayUserInfoShareRequest();
-                AlipayUserInfoShareResponse alipayUserInfoShareResponse = alipayClient.execute(alipayUserInfoShareRequest,response.getAccessToken());
-                if(alipayUserInfoShareResponse.isSuccess()){
+				AlipayUserInfoShareResponse alipayUserInfoShareResponse = alipayClient.execute(alipayUserInfoShareRequest, response.getAccessToken());
+				if (alipayUserInfoShareResponse.isSuccess()) {
 					log.info("获取用户支付宝信息调用成功, {}", alipayUserInfoShareResponse.getBody());
 					return alipayUserInfoShareResponse.getBody();
 				} else {
@@ -479,7 +508,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayUserInfoAuthResponse response = alipayClient.execute(request);
 		log.info("解冻预授权response: {}" + response.getBody());
 		log.info(response.toString());
-        if(response.isSuccess()){
+		if (response.isSuccess()) {
 			log.info("用户授权调用成功");
 		} else {
 			log.info("用户授权调用失败");
@@ -610,7 +639,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				return false;
 			}
 		} catch (Exception e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+			;
 			log.info("退款失败请重试");
 		}
 		return false;
@@ -618,10 +648,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 
 	/**
 	 * 查询预授权订单
+	 *
 	 * @param tradNo
 	 * @throws AlipayApiException
 	 */
-    public ObjectRestResponse fundAuthQuery(String tradNo){
+	public ObjectRestResponse fundAuthQuery(String tradNo) {
 		AlipayClient alipayClient = getAlipayClient();
 		AlipayFundAuthOperationDetailQueryRequest request = new AlipayFundAuthOperationDetailQueryRequest();
 		AlipayFundAuthOperationDetailQueryModel model = new AlipayFundAuthOperationDetailQueryModel();
@@ -633,7 +664,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayFundAuthOperationDetailQueryResponse response = null;
 		try {
 			response = alipayClient.execute(request);
-            log.info("response: {}"+response.getBody());
+			log.info("response: {}" + response.getBody());
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
 		}
@@ -642,6 +673,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 
 	/**
 	 * 预授权转支付退款
+	 *
 	 * @param tradNo       预授权转支付商户订单号
 	 * @param refundAmount 退款金额
 	 * @param refundReason 退款原因
@@ -663,7 +695,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
 		}
-        log.info("response: {}"+response.getBody());
+		log.info("response: {}" + response.getBody());
 		return response;
 	}