dao/src/main/java/com/sandu/ximon/dao/domain/WxConfigEntity.java
@@ -48,6 +48,11 @@ private String privateKey; /** * */ private String keyPath; /** * 状态 1启用 / 0未启用 */ @JsonIgnore dao/src/main/resources/mapper/UsrWxPayConfigMapper.xml
@@ -10,6 +10,7 @@ <result property="appappid" column="appappid" jdbcType="VARCHAR"/> <result property="mchId" column="mch_id" jdbcType="VARCHAR"/> <result property="privateKey" column="private_key" jdbcType="VARCHAR"/> <result property="keyPath" column="key_path" jdbcType="VARCHAR"/> <result property="appSecret" column="app_secret" jdbcType="VARCHAR"/> <result property="state" column="state" jdbcType="INTEGER"/> <result property="clientId" column="client_id" jdbcType="BIGINT"/> ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -50,9 +50,7 @@ if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) { throw new BusinessException("退款参数不能为空"); } // 0.00 用于占位 没有实际用处 退款接口好几个地方调用 不太好改 return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo(), 0.00)); return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo())); } /** ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -174,6 +174,7 @@ lastOrderByC3Mac.setChargingStates(1); //设置剩余金额 lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount())); lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount())); SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac); } } ximon-admin/src/main/java/com/sandu/ximon/admin/param/WxpayConfigParam.java
@@ -39,6 +39,9 @@ @NotEmpty(message = "Secret不能为空") private String appSecret; private String keyPath; /** * 状态 1启用 / 0未启用 */ ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
@@ -19,9 +19,13 @@ import com.github.binarywang.wxpay.service.WxPayService; import com.sandu.common.execption.BusinessException; import com.sandu.common.util.IpUtil; import com.sandu.common.util.SpringContextHolder; import com.sandu.ximon.admin.dto.wxquerydto.WxOrderDto; import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService; import com.sandu.ximon.admin.service.C3mOrderService; import com.sandu.ximon.dao.domain.C3mOrder; import com.sandu.ximon.dao.domain.WxConfigEntity; import com.sandu.ximon.dao.enums.OrderStatus; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -170,30 +174,67 @@ /** * 退款 * * @param totalAmount * @param refundAmount * @param outTradeNo * @param poleId * @return */ @Transactional(rollbackFor = Exception.class) public boolean refund(Double totalAmount, Double refundAmount, String outTradeNo, Long poleId) { WxConfigEntity wxConfig = UsrWxPayConfigService.getBean().getConfigByPoleId(poleId); public boolean refund(C3mOrder c3mOrder) { // WxPayRefundRequest refundRequest = new WxPayRefundRequest(); // refundRequest.setOutTradeNo(orderId); // refundRequest.setOutRefundNo(refundSn); // refundRequest.setRefundFee(refundFee); // refundRequest.setTotalFee(refundFee); // refundRequest.setNotifyUrl(callbackUrl); // try { // WxPayRefundResult wxPayRefundResult = wxPayService.refund(refundRequest); // if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayRefundResult.getResultCode())) { // return true; // } else { // log.error("微信退款失败，{}", wxPayRefundResult.getErrCodeDes()); // throw new BusinessException("微信退款失败，" + wxPayRefundResult.getErrCodeDes()); // } // } catch (WxPayException e) { // log.error("微信退款失败，{}", e.getErrCodeDes()); // throw new BusinessException("微信退款失败，" + e.getErrCodeDes()); // } // WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(c3mOrder.getPoleId()); if (wxConfig.getKeyPath() == null && wxConfig.getKeyPath().isEmpty()) { throw new BusinessException("微信证书不存在,无法进行退款"); } //设置微信支付参数 WxPayConfig payConfig = new WxPayConfig(); payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppappid())); payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId())); payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey())); payConfig.setSubAppId(StringUtils.trimToNull(null)); payConfig.setSubMchId(StringUtils.trimToNull(null)); payConfig.setKeyPath(StringUtils.trimToNull(wxConfig.getKeyPath())); wxPayService.setConfig(payConfig); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); String refundNo = sdf.format(new Date()); WxPayRefundRequest refundRequest = new WxPayRefundRequest(); //退款金额不能大于订单总金额 if (refundAmount > totalAmount) { if (c3mOrder.getRefundAmount() > c3mOrder.getTotalAmount()) { throw new BusinessException("退款金额不能大于订单总金额"); } refundRequest.setOutTradeNo(outTradeNo); System.out.println("" + c3mOrder.getRefundAmount()); refundRequest.setOutTradeNo(c3mOrder.getOutTradeNo()); refundRequest.setOutRefundNo(refundNo); refundRequest.setTotalFee(Integer.valueOf(parseWxAmount((totalAmount + "")))); refundRequest.setRefundFee(Integer.valueOf(parseWxAmount((refundAmount + "")))); refundRequest.setTotalFee(Integer.valueOf(parseWxAmount((c3mOrder.getTotalAmount() + "")))); refundRequest.setRefundFee(Integer.valueOf(parseWxAmount((c3mOrder.getRefundAmount() + "")))); try { WxPayRefundResult wxPayRefundResult = wxPayService.refund(refundRequest); if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayRefundResult.getResultCode())) { c3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus()); c3mOrder.setChargingStates(1); SpringContextHolder.getBean(C3mOrderService.class).updateById(c3mOrder); return true; } else { log.error("微信退款失败，{}", wxPayRefundResult.getErrCodeDes()); ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
@@ -71,11 +71,6 @@ } public static UsrWxPayConfigService getBean() { return (UsrWxPayConfigService) SpringContextUtil.getBean("UsrWxPayConfigService"); } public boolean addWxPayConfig(WxpayConfigParam configParam) { WxConfigEntity config = new WxConfigEntity(); BeanUtil.copyProperties(configParam, config); @@ -157,16 +152,16 @@ ); } List<WxConfigEntity> list = list(wrapper); list.forEach( wxConfigEntity -> { //设置支付参数中的appid和appappid mchId和privateKey中的部分替换为* wxConfigEntity.setAppid(wxConfigEntity.getAppid().replaceAll("(?<=.{4}).*(?=.{4})", "*")); wxConfigEntity.setAppappid(wxConfigEntity.getAppappid().replaceAll("(?<=.{4}).*(?=.{4})", "*")); wxConfigEntity.setMchId(wxConfigEntity.getMchId().replaceAll("(?<=.{4}).*(?=.{4})", "*")); wxConfigEntity.setPrivateKey(wxConfigEntity.getPrivateKey().replaceAll("(?<=.{4}).*(?=.{4})", "*")); wxConfigEntity.setAppSecret(wxConfigEntity.getAppSecret().replaceAll("(?<=.{4}).*(?=.{4})", "*")); } ); // list.forEach( // wxConfigEntity -> { // //设置支付参数中的appid和appappid mchId和privateKey中的部分替换为* // wxConfigEntity.setAppid(wxConfigEntity.getAppid().replaceAll("(?<=.{4}).*(?=.{4})", "*")); // wxConfigEntity.setAppappid(wxConfigEntity.getAppappid().replaceAll("(?<=.{4}).*(?=.{4})", "*")); // wxConfigEntity.setMchId(wxConfigEntity.getMchId().replaceAll("(?<=.{4}).*(?=.{4})", "*")); // wxConfigEntity.setPrivateKey(wxConfigEntity.getPrivateKey().replaceAll("(?<=.{4}).*(?=.{4})", "*")); // wxConfigEntity.setAppSecret(wxConfigEntity.getAppSecret().replaceAll("(?<=.{4}).*(?=.{4})", "*")); // } // ); return list; }
@@ -71,18 +71,18 @@ * @param outTradeNo * @return */ public boolean orderRefund(String outTradeNo, Double amt) { public boolean orderRefund(String outTradeNo) { Long userId = SecurityUtils.getUserId(); String username = SecurityUtils.getUsername(); C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo); Double refundAmount = orderByOutTradeNo.getSurplusAmount(); if (orderByOutTradeNo.getTotalAmount() < refundAmount) { throw new BusinessException("退款金额错误,不能大于付款金额"); } if (orderByOutTradeNo == null) { throw new BusinessException("未找到订单"); } else { orderByOutTradeNo.setRefundAmount(refundAmount); if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) { throw new BusinessException("退款金额错误,不能大于付款金额"); } orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount()); return c3mOrderRefund(orderByOutTradeNo, "充电桩退款", userId, username); } @@ -110,12 +110,7 @@ C3mOrder.getRefundAmount()); } else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) { // 进行微信退款 b = fastPayService.refund( C3mOrder.getTotalAmount(), C3mOrder.getRefundAmount(), C3mOrder.getOutTradeNo(), C3mOrder.getPoleId() ); b = fastPayService.refund(C3mOrder); } C3mOrder.setRefundTimestamp(System.currentTimeMillis()); C3mOrder.setRefundMsg(msg); @@ -189,7 +184,8 @@ c3mOrderEntity.setOrderStatus(0); c3mOrderEntity.setUserCode(wxCode); c3mOrderEntity.setC3Udid(c3m.getMcuUdid()); c3mOrderEntity.setRefundAmount(totalAmount); c3mOrderEntity.setSurplusAmount(totalAmount); if (save(c3mOrderEntity)) {
