Merge branch 'master' of http://8.138.18.76:3000/qmrb/parking-server

src/main/java/com/qmrb/system/controller/CarParkStoredCardController.java

@@ -69,11 +69,12 @@ public class CarParkStoredCardController{
     public Result<?> getPageByUserId(
             @ParameterObject CarParkStoredCardQuery queryParams
     ) {
-        if(queryParams.getUserId() == null){
-            return Result.failed("用户id不能为空");
-        }
-        List<CarParkStoredCard> list = carParkStoredCardService.list(new LambdaQueryWrapper<CarParkStoredCard>().eq(CarParkStoredCard::getUserId,queryParams.getUserId())
-                .eq(StrUtil.isNotBlank(queryParams.getPlateNumber()),CarParkStoredCard::getPlateNumber,queryParams.getPlateNumber()));
+        // if(queryParams.getUserId() == null){
+        //     return Result.failed("用户id不能为空");
+        // }
+        List<CarParkStoredCard> list = carParkStoredCardService.list(new LambdaQueryWrapper<CarParkStoredCard>()
+                // .eq(CarParkStoredCard::getUserId,queryParams.getUserId())
+                .eq(CarParkStoredCard::getPlateNumber,queryParams.getPlateNumber()));
         return Result.success(list);
     }
     

src/main/java/com/qmrb/system/controller/OrderController.java

@@ -195,6 +195,8 @@ public class OrderController extends CommonController {
         orderService.save(new Order().setAmountsPayable(toCreatOrderVO.getTotal())
                 .setPayDescription(toCreatOrderVO.getDescription())
                  .setId(id)
+                 .setGoodId(toCreatOrderVO.getGoodId())
+                 .setGoodsName(toCreatOrderVO.getDescription())
                  .setPayStatus(SystemConstant.NUM_ZERO));
         return process(() -> orderService.createOrder(toolWxConfigService.findConf(),toCreatOrderVO));
     }
@@ -250,17 +252,21 @@ public class OrderController extends CommonController {
         //todo 调用计费模块,计算是否有应付费用
         BigDecimal bigDecimal = new BigDecimal(1);
 
+        
         BarnRecordForm formData = barnRecordService.chargingByBarnId(id);
         if(formData != null && formData.getPendingAmount() != null && formData.getPendingAmount().compareTo(BigDecimal.ZERO) >0){
             ToCreateOrderVO toCreateOrderVO = new ToCreateOrderVO();
             toCreateOrderVO.setTotal(formData.getPendingAmount().multiply(new BigDecimal(100)).intValueExact());
             toCreateOrderVO.setDescription("停车缴费");
             toCreateOrderVO.setOpenId(openId);
-            
+            Long orderId = IdUtil.getSnowflake().nextId();
+            toCreateOrderVO.setOutTradeNo(orderId.toString());
             //订单入库
             orderService.save(new Order().setAmountsPayable(toCreateOrderVO.getTotal())
                     .setPayDescription(toCreateOrderVO.getDescription())
-                    .setId(id)
+                    .setId(orderId)
+                    .setGoodId(id)
+                    .setGoodsName(toCreateOrderVO.getDescription())
                     .setPayStatus(SystemConstant.NUM_ZERO));
             return process(() -> orderService.createOrder(toolWxConfigService.findConf(),toCreateOrderVO));
         }else if(formData != null && formData.getPendingAmount() != null && formData.getPendingAmount().compareTo(BigDecimal.ZERO) <= 0){

src/main/java/com/qmrb/system/pojo/entity/CarParkChargingRules.java

@@ -39,6 +39,12 @@ public class CarParkChargingRules extends BaseEntity {
      */
     @TableField("free_time")
     private Integer freeTime;
+    
+    /**
+     * 离场时长(分钟)
+     */
+    @TableField("out_interval")
+    private Integer outInterval;
 
     /**
      * 计费周期,每几分钟计一次费用

src/main/java/com/qmrb/system/pojo/form/CarParkChargingRulesForm.java

@@ -1,5 +1,6 @@
 package com.qmrb.system.pojo.form;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -54,4 +55,9 @@ public class CarParkChargingRulesForm {
     private BigDecimal firstFee;
 
 
+    /**
+     * 离场时长(分钟)
+     */
+    @Schema(description = "离场时长(分钟)",type="Integer")
+    private Integer outInterval;
 }

src/main/java/com/qmrb/system/pojo/query/CarParkChargingRulesQuery.java

@@ -59,5 +59,9 @@ public class CarParkChargingRulesQuery extends BasePageQuery{
      */
     @Schema(description = "首周期计费金额",type="BigDecimal")
     private BigDecimal firstFee;
-
+    /**
+     * 离场时长(分钟)
+     */
+    @Schema(description = "离场时长(分钟)",type="Integer")
+    private Integer outInterval;
 }

src/main/java/com/qmrb/system/pojo/vo/CarParkChargingRulesVO.java

@@ -56,5 +56,9 @@ public class CarParkChargingRulesVO {
      */
     @Schema(description = "首周期计费金额",type="BigDecimal")
     private BigDecimal firstFee;
-
+    /**
+     * 离场时长(分钟)
+     */
+    @Schema(description = "离场时长(分钟)",type="Integer")
+    private Integer outInterval;
 }

src/main/java/com/qmrb/system/pojo/vo/ToCreateOrderVO.java

@@ -37,4 +37,9 @@ public class ToCreateOrderVO {
      * 用户openId
      */
     String openId;
+    
+    /**
+     * 停车记录id
+     */
+    Long goodId;
 }

src/main/java/com/qmrb/system/service/impl/OrderServiceImpl.java

@@ -476,6 +476,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         this.save(new Order().setAmountsPayable(toCreatOrderVO.getTotal())
                 .setPayDescription(toCreatOrderVO.getDescription())
                 .setId(id)
+                .setGoodId(toCreatOrderVO.getGoodId())
+                .setGoodsName(toCreatOrderVO.getDescription())
                 .setPayStatus(SystemConstant.NUM_ZERO));
         //调用微信下单接口
         this.createOrder(toolWxConfigService.findConf(),toCreatOrderVO);