缴费记录

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

@@ -123,11 +123,12 @@ public class MonthlyParkingRegistrationController{
         if(StrUtil.isBlank(ids)) {
             return Result.failed(ResultCode.PARAM_ERROR, "删除的月租车登记信息表数据为空");
         }
+        Integer status = Integer.valueOf(map.get("status"));
         // 逻辑删除
         List<Long> idList = Arrays.asList(ids.split(",")).stream()
                 .map(idStr -> Long.parseLong(idStr)).collect(Collectors.toList());
         LambdaUpdateWrapper<MonthlyParkingRegistration> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(MonthlyParkingRegistration::getRevisitFlag,1);//回访标记（0-未回访 1-已回访 2-需再次回访）
+        updateWrapper.set(MonthlyParkingRegistration::getRevisitFlag,status);//回访标记（0-未回访 1-已回访 2-需再次回访）
         updateWrapper.set(MonthlyParkingRegistration::getRevisitTime,new Date());
         updateWrapper.set(MonthlyParkingRegistration::getRevisitOperator, SecurityUtils.getUserId());
         updateWrapper.in(MonthlyParkingRegistration::getId,idList);

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

@@ -148,6 +148,8 @@ public class OrderController extends CommonController {
     ) {
         queryParams.setUserId(SecurityUtils.getUserId() != null ? SecurityUtils.getUserId().toString() : "");
         if (StrUtil.isNotBlank(queryParams.getUserId())) {
+            List<Integer> payStatusList = Arrays.asList(1, 3);
+            queryParams.setPayStatusList(payStatusList);
             Page<PayOrderVO> pageResult = orderService.getPageByUserId(queryParams);
             if (CollectionUtil.isNotEmpty(pageResult.getRecords())) {
                 List<PayOrderVO> list = pageResult.getRecords().stream().map(item -> {

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

@@ -69,5 +69,9 @@ public class ContractPlaceNumberRelHis extends BaseEntity {
     @TableField("contract_id")
     private Long contractId;
 
-
+    /**
+     * 虚拟车位号
+     */
+    @TableField("virtual_slot_number")
+    private String  virtualSlotNumber;
 }

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -54,6 +55,12 @@ public class PayOrderQuery extends BasePageQuery{
      */
 	@Schema(description = "支付状态:0 未支付 1 已支付 2 退款中 3 已退款 4 退款失败",type="Integer")
     private Integer payStatus;
+    
+    /**
+     * 支付状态:0 未支付 1 已支付 2 退款中 3 已退款 4 退款失败
+     */
+	@Schema(description = "支付状态:0 未支付 1 已支付 2 退款中 3 已退款 4 退款失败",type="Integer")
+    private List<Integer> payStatusList;
     /**
      * 订单描述
      */

src/main/java/com/qmrb/system/service/IBarnRecordService.java

@@ -56,4 +56,11 @@ public interface IBarnRecordService extends IService<BarnRecord> {
 	BarnRecordForm getByOrderId(String orderNo);
 
 	boolean takeCar(Long id, BarnRecordForm form) throws MQBrokerException, RemotingException, UnsupportedEncodingException, InterruptedException, MQClientException;
+
+	/**
+	 * 退费后更新停车记录已缴费金额
+	 * @param orderId
+	 * @return
+	 */
+    Boolean refundBarnRecord(String orderId);
 }

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmrb.system.converter.BarnRecordConverter;
 import com.qmrb.system.mapper.BarnRecordMapper;
 import com.qmrb.system.mapper.CouponMapper;
+import com.qmrb.system.mapper.OrderMapper;
 import com.qmrb.system.mq.PickCarProducer;
 import com.qmrb.system.pojo.entity.*;
 import com.qmrb.system.pojo.form.BarnRecordForm;
@@ -67,6 +68,9 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
 
     @Autowired
     private PickCarProducer pickCarProducer;
+    
+    @Autowired
+    private OrderMapper orderMapper;
 
     @Value("${pickCarProducer.topic}")
     private String topic;
@@ -404,6 +408,18 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         return result;
     }
 
+    @Override
+    public Boolean refundBarnRecord(String orderId) {
+        Order order = orderMapper.selectById(orderId);
+        if(order == null){
+            return false;
+        }
+        BarnRecord record = this.getById(order.getGoodId());
+        record.setReceivedAmount(record.getReceivedAmount().subtract(order.getAmountActuallyPaid()));
+        
+        return this.updateById(record);
+    }
+
 
     /**
      * 计算两个时间差（年，月，星期，日，时，分，秒）

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

@@ -544,6 +544,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                       updateStatus(statusCode,outRefundNo);
                     //2.更新实付金额为0,并且更新退款时间
                     updateRefundOrderAmountActuallyPaid(BigDecimal.ZERO, outRefundNo);
+                    try {
+                        Boolean result =  barnRecordService.refundBarnRecord(outRefundNo);
+                        log.info("退费后已收费要减掉退费金额结果：====>{}",result);
+                    }catch (Exception e){
+                        log.error("退费后已收费要减掉退费金额出错",e);
+                    }
                     return true;
                 }
             } catch (Exception e) {

src/main/resources/mapper/OrderMapper.xml

@@ -19,6 +19,13 @@
         <if test="queryParams.invoiceInd  != null and queryParams.invoiceInd != ''">
             and po.invoice_ind = #{queryParams.invoiceInd}
         </if>
+        <if test="queryParams.payStatusList != null and queryParams.payStatusList.size() > 0">
+            and po.pay_status in  
+            <foreach collection="queryParams.payStatusList" item="payStatus" separator="," open="(" close=")">
+                #{payStatus}
+            </foreach>
+        </if>    
+       
         order by po.pay_time desc
     </select>
 </mapper>