退款失败修改订单状态为10 退款失败 成功改为7 已退款

src/main/java/com/template/controller/HouseOrderController.java

@@ -2536,7 +2536,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 
                     // 订单状态
-                    rr.setOrderStatus("9");
+                    rr.setOrderStatus("7");
 //                    退款时间
                     rr.setRefundTime(new Date());
 
@@ -2561,11 +2561,36 @@ public class HouseOrderController implements HouseOrderAPI {
                         rpr.setIsSuccess(2);
                         rpr.setRemark(rpr.getRemark()+"|微信支付退款失败："+tradeState+"--"+TimeExchange.getTime());
 
+                    }else{
+                        rpr = new RefundRecord();
+                        rpr.setHouseOrderId(rr.getId());
+                        rpr.setUserId(Integer.valueOf(rr.getReserveUserId()));
+                        rpr.setRefundNo(outRefundNo);
+                        rpr.setWxNo(refundId);
+//                        System.out.println("回调的金额：" + total_fee);
+//                        rpr.setRefundPrice(new BigDecimal(total_fee).divide(new BigDecimal("100")).setScale(2));
+                        rpr.setIsSuccess(2);
+                        rpr.setRemark("微信支付退款失败");
+                        Boolean insertRpr = refundRecordService.save(rpr);
+                    }
+                    // 订单状态改为失败
+                    rr.setOrderStatus("10");
+//                    退款时间
+                    rr.setRefundTime(new Date());
+                    Boolean updateHouseOrder = houseOrderService.updateById(rr);
+                    //更新成功返回200
+                    if (!updateHouseOrder) {
+                        response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("code", "FAIL");
+                        jsonObject.put("message", "失败");
+                        response.getWriter().write(jsonObject.toJSONString());
                     }
-                    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+                    response.setStatus(HttpServletResponse.SC_OK);
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("code", "FAIL");
-                    jsonObject.put("message", "失败");
+                    jsonObject.put("code", "SUCCESS");
+                    jsonObject.put("message", "SUCCESS");
                     response.getWriter().write(jsonObject.toJSONString());
                 }
             }
@@ -2697,12 +2722,15 @@ public class HouseOrderController implements HouseOrderAPI {
         if(reFundRecord.getIsSuccess()==1){
             result.put("code","200");
             result.put("message","退款已完成");
-            one.setOrderStatus("9");
+            one.setOrderStatus("7");
             one.setRefundTime(new Date());
             houseOrderService.updateById(one);
             return CommonResult.ok(result);
         }
         if(reFundRecord.getIsSuccess()==2){
+            one.setOrderStatus("10");
+            one.setRefundTime(new Date());
+            houseOrderService.updateById(one);
             result.put("code","1002");
             result.put("message","退款失败，原因:"+reFundRecord.getRemark());
             //失败不更新订房单
@@ -2730,7 +2758,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 log.info("微信退款查询订单出参："+refund.toString());
                 switch (refund.getStatus()){
                     case SUCCESS:
-                        one.setOrderStatus("9");
+                        one.setOrderStatus("7");
                         one.setRefundTime(new Date());
                         reFundRecord.setRefundNo(refund.getOutRefundNo());
                         reFundRecord.setWxNo(refund.getRefundId());
@@ -2745,7 +2773,7 @@ public class HouseOrderController implements HouseOrderAPI {
                         result.put("message","退款处理中，请稍后再查询:"+reFundRecord.getRemark());
                         break;
                     case CLOSED:
-                        one.setOrderStatus("9");
+                        one.setOrderStatus("10");
                         one.setRefundTime(new Date());
                         reFundRecord.setIsSuccess(2);
                         reFundRecord.setRemark(reFundRecord.getRemark()+"|退款处理失败，退款订单被关闭，联系商户处理："+TimeExchange.getTime());
@@ -2754,7 +2782,7 @@ public class HouseOrderController implements HouseOrderAPI {
                         break;
                     case ABNORMAL:
                         reFundRecord.setIsSuccess(2);
-                        one.setOrderStatus("9");
+                        one.setOrderStatus("10");
                         one.setRefundTime(new Date());
                         reFundRecord.setRemark(reFundRecord.getRemark()+"|退款处理失败，退款异常，联系商户处理："+TimeExchange.getTime());
                         result.put("code","1005");