Accept Merge Request #12: (develop-wxl -> master)

Merge Request: 订单查询取消增加现金支付逻辑

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/12

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

@@ -62,6 +62,7 @@ import java.util.*;
 
 import static com.template.common.utils.StrUtils.getUUIDBits;
 import static com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.NOTPAY;
+import static com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.SUCCESS;
 
 /**
  * <p>
@@ -1732,6 +1733,11 @@ public class HouseOrderController implements HouseOrderAPI {
     public CommonResult queryOrderById(String outTradeNo) throws Exception{
         Transaction transaction= new Transaction();
         HouseOrder one = houseOrderService.getOne(new QueryWrapper<HouseOrder>().eq("order_number",outTradeNo));
+        if("2".equals(one.getOrderStatus())&&"2".equals(one.getPayType())){
+            transaction.setTradeState(SUCCESS);
+            transaction.setTradeStateDesc("现金支付完成");
+            return CommonResult.ok(transaction);
+        }
         PayRecord payRecord=payRecordService.getOne(new QueryWrapper<PayRecord>().eq("house_order_id",one.getId()));
         if(payRecord==null||payRecord.getPayNo()==null){
             transaction.setTradeState(NOTPAY);
@@ -2214,10 +2220,16 @@ public class HouseOrderController implements HouseOrderAPI {
             //  设置取消时间
             houseOrder.setCancelTime(new Date());
 
+            //现金支付直接修改未已退款
+            if("2".equals(houseOrder.getPayType())){
+                houseOrder.setOrderStatus("9");
+                houseOrderService.updateById(houseOrder);
+                houseNumberStateService.removeById(houseNumberState);
+                return CommonResult.ok("现金支付订单取消成功");
+            }
             String orderStatus = houseOrder.getOrderStatus();
             //        判断是否付款，已支付则是退款，未支付则是取消
 
-
             if ("2".equals(orderStatus) || "3".equals(orderStatus)) {
                 //        退款订单号
                 String refund_no = UUID.randomUUID().toString();
@@ -2311,7 +2323,7 @@ public class HouseOrderController implements HouseOrderAPI {
             }
             houseOrder.setOrderStatus("9");
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+//            houseNumberStateService.updateById(houseNumberState);
             houseNumberStateService.removeById(houseNumberState);
             return CommonResult.ok();