Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java

@@ -265,7 +265,7 @@ public class OutRechargeOrderController {
                 Map<String,String> param = new HashMap<>();
                 param.put("appid", "wx637bd6f7314daa46");
                 param.put("mch_id", "1289663601");
-                param.put("sub_mch_id" , "1609882817");
+                param.put("sub_mch_id" , "1614670195");
                 param.put("nonce_str", WxUtils.makeNonStr());
                 param.put("transaction_id", order.getPaySerialNo());
                 param.put("out_refund_no", "HFR"+new Date().getTime());
@@ -286,12 +286,12 @@ public class OutRechargeOrderController {
                     order.setRefundFee(new BigDecimal(orderRefundModel.getRefund_fee()).divide(new BigDecimal("100")));
                     outRechargeOrderService.updateOrder(order);
                     return ResponseMsgUtil.success("退款成功");
+                } else {
+                    log.error("orderToPay error!", "退款失败");
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败！错误代码："+orderRefundModel.getErr_code()+",错误描述"+orderRefundModel.getErr_code_des());
                 }
-                return ResponseMsgUtil.success("退款失败！错误代码："+orderRefundModel.getErr_code()+",错误描述"+orderRefundModel.getErr_code_des());
             }
 
-
-
         } catch (Exception e) {
             log.error("HighOrderController --> getUserOrderList() error!", e);
             return ResponseMsgUtil.exception(e);