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

Merge Request: 1111

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

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

@@ -2429,10 +2429,13 @@ public class HouseOrderController implements HouseOrderAPI {
     @Override
     public CommonResult payOrderPrice(HouseOrderPriceDto houseOrderPriceDto) {
         Double price = houseOrderPriceDto.getPrice();
-
+        String payType =houseOrderPriceDto.getPayType()+"";
         if (price<=0) {
             return CommonResult.fail("金额异常");
         }
+        if(!StringUtils.hasText(payType)){
+            return CommonResult.fail("支付类型异常");
+        }
 
         String orderNumber = houseOrderPriceDto.getOrderNumber();
 
@@ -2440,15 +2443,32 @@ public class HouseOrderController implements HouseOrderAPI {
         wrapper.eq(HouseOrder::getOrderNumber,orderNumber);
         HouseOrder one = houseOrderService.getOne(wrapper);
         one.setPayPrice(BigDecimal.valueOf(price));
-        boolean oneFlag=houseOrderService.updateById(one);
-        if(!oneFlag){
-            return CommonResult.fail("订单价格修改失败");
-        }
+        one.setPayType(payType);
         if(!"1".equals(one.getOrderStatus())){
             return CommonResult.fail("订单状态不为待支付");
         }
         //查询是否有未支付订单，有则调用关闭更新支付订单号重新生成支付订单
         List<PayRecord> houseOrderId = payRecordService.list(new QueryWrapper<PayRecord>().eq("house_order_id", one.getId()));
+        //现金支付流程
+        if("2".equals(payType)){
+            if(houseOrderId.size()>0){
+                try {
+                    this.closeOrderById(houseOrderId.get(0).getPayNo());
+                } catch (Exception e) {
+                    return CommonResult.fail("关闭已生成支付订单失败返回，请查询订单支付状态:"+e.getMessage());
+                }
+            }
+            one.setOrderStatus("2");
+            boolean oneFlag=houseOrderService.updateById(one);
+            if(!oneFlag){
+                return CommonResult.fail("订单现金支付失败");
+            }
+            return CommonResult.ok("订单现金支付完成");
+        }
+        boolean oneFlag=houseOrderService.updateById(one);
+        if(!oneFlag){
+            return CommonResult.fail("订单价格修改失败");
+        }
         PayRecord payRecord=houseOrderId.size()>0?houseOrderId.get(0):new PayRecord();
         if (StringUtils.hasText(payRecord.getPayNo())){
             try {