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

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

@@ -115,5 +115,14 @@ public class PayOrderQuery extends BasePageQuery{
 	@Schema(description = "退款原始订单id",type="Long")
     private Long refundPid;
 
-
+    /**
+     * 退款申请标记 0待申请 1已申请
+     */
+    @Schema(description = "退款申请标记")
+    private String  refundApplyInd;
+    /**
+     * 开票标志1已开票 0 待开发票
+     */
+    @Schema(description = "开票标志")
+    private String invoiceInd;
 }

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

@@ -159,4 +159,11 @@ public class PayOrderVO {
      */
     @Schema(description = "退款原因")
     private String refundReson;
+    
+    
+    /**
+     * 开票标志1已开票 0 待开发票
+     */
+    @Schema(description = "开票标志")
+    private String invoiceInd;
 }

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

@@ -275,10 +275,10 @@ public class CarParkChargingRulesServiceImpl extends ServiceImpl<CarParkCharging
 		
 		// 根据停车记录获取拥有的优惠券
 		if(deductionSwitch){
-			System.out.println("是否开启抵扣 = " + deductionSwitch);
+			// System.out.println("是否开启抵扣 = " + deductionSwitch);
 			List<Coupon> coupons = couponMapper.selectList(new LambdaQueryWrapper<Coupon>().eq(Coupon::getGoodsId, recordId));
 			if(CollectionUtil.isNotEmpty(coupons)){
-				System.out.println("优惠券 = " );
+				// System.out.println("优惠券 = " );
 				Coupon coupon = coupons.get(0);
 				ParkingFeeCalculator.CouponRecord couponRecord = new ParkingFeeCalculator.CouponRecord();
 				couponRecord.denomination = coupon.getDenomination() != null ? coupon.getDenomination().doubleValue() : 0;
@@ -296,7 +296,7 @@ public class CarParkChargingRulesServiceImpl extends ServiceImpl<CarParkCharging
 			}else{
 				// 判断是否否存在包租协议
 				Map<String,Object> map = contractPlaceNumberRelService.getDenomination(recordId);
-				System.out.println("包租协议 = " + JSON.toJSONString(map));
+				// System.out.println("包租协议 = " + JSON.toJSONString(map));
 				if(CollectionUtil.isNotEmpty(map)){
 					parkingRecord.contractType = "3";//包租协议
 				}

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

@@ -289,7 +289,6 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
             LocalDateTime endTime = endTimeinstant.atZone(ZoneId.systemDefault()).toLocalDateTime();
             map.put("denomination", Double.valueOf(between));
             map.put("expireTime", endTime);
-            log.info("包租协议抵扣时长：",between,endTime);
             return map;
         }
         return null;

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

@@ -46,7 +46,7 @@ public class MonthlyParkingRegistrationServiceImpl extends ServiceImpl<MonthlyPa
         // 查询数据
         Page<MonthlyParkingRegistration> dictItemPage = this.page(
                 new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<MonthlyParkingRegistration>()
+                new LambdaQueryWrapper<MonthlyParkingRegistration>().orderByDesc(MonthlyParkingRegistration::getCreateTime)
                 	//.like(StrUtil.isNotBlank(keywords), MonthlyParkingRegistration::getCategoryName, keywords)
         );
 

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

@@ -110,18 +110,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         // 查询参数
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
-
+        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<Order>().eq(queryParams.getGoodId() != null, Order::getGoodId, queryParams.getGoodId())
+                .eq(queryParams.getPayStatus() != null, Order::getPayStatus, queryParams.getPayStatus())
+                .eq(StringUtils.isNotBlank(queryParams.getPlateNumber()), Order::getPlateNumber, queryParams.getPlateNumber())
+                .eq(queryParams.getPayStatus() != null, Order::getPayStatus, queryParams.getPayStatus())
+                .ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), Order::getPayTime, queryParams.getStartTimeBegin())
+                .le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), Order::getPayTime, queryParams.getStartTimeEnd())
+                .orderByDesc(Order::getPayTime);
+        if(StrUtil.isNotBlank(queryParams.getRefundApplyInd())){
+            if("1".equals(queryParams.getRefundApplyInd())){
+                queryWrapper.eq(Order::getRefundApplyInd,queryParams.getRefundApplyInd());
+            } else if ("0".equals(queryParams.getRefundApplyInd())) {
+                queryWrapper.isNull(Order::getRefundApplyInd);
+            }
+        }
 
         // 查询数据
         Page<Order> dictItemPage = this.page(
                 new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<Order>().eq(queryParams.getGoodId() != null,Order::getGoodId,queryParams.getGoodId())
-                        .eq(queryParams.getPayStatus() != null,Order::getPayStatus,queryParams.getPayStatus())
-                        .eq(StringUtils.isNotBlank(queryParams.getPlateNumber()),Order::getPlateNumber,queryParams.getPlateNumber())
-                        .eq(queryParams.getPayStatus()!= null,Order::getPayStatus,queryParams.getPayStatus())
-                        .ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), Order::getPayTime, queryParams.getStartTimeBegin())
-                        .le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), Order::getPayTime, queryParams.getStartTimeEnd())
-                        .orderByDesc(Order::getPayTime)
+                queryWrapper
         );
 
         // 实体转换

src/main/java/com/qmrb/system/wxpayback/api/CommonController.java

@@ -42,7 +42,7 @@ public class CommonController {
             log.error(this.getClass().getSimpleName(), e);
             log.error(this.getClass().getSimpleName(),e.getLocalizedMessage());
             // return CommonResult.failed(e.getErrorCode());
-            return CommonResult.failed("退款失败");
+            return CommonResult.failed("支付失败");
         } catch (Exception e){
             log.error(this.getClass().getSimpleName(), e);
             log.error(this.getClass().getSimpleName(),e.getLocalizedMessage());

src/main/resources/mapper/MonthlyParkingRegistrationMapper.xml

@@ -4,6 +4,6 @@
 
     <select id="exportList" resultType="com.qmrb.system.pojo.vo.MonthlyParkingRegistrationExcelVO"
             parameterType="com.qmrb.system.pojo.query.MonthlyParkingRegistrationQuery">
-        select * from monthly_parking_registration
+        select * from monthly_parking_registration order by create_time desc
     </select>
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -16,5 +16,9 @@
                                where user_id = #{queryParams.userId}
                                order by create_time desc limit 1
             )
+        <if test="queryParams.invoiceInd  != null and queryParams.invoiceInd != ''">
+            and po.invoice_ind = #{queryParams.invoiceInd}
+        </if>
+        order by po.pay_time desc
     </select>
 </mapper>