Browse Source

修复 包租客商账户看不到历史记录

xlq 1 week ago
parent
commit
b608d78526

+ 7 - 0
src/main/java/com/qmrb/system/controller/OrderController.java

@@ -227,6 +227,13 @@ public class OrderController extends CommonController {
         return process(() -> orderService.createOrder(toolWxConfigService.findConf(), toCreatOrderVO));
     }
 
+    /**
+     * @description:订单退款
+     * @param: outTradeNo
+     * @return: com.qmrb.system.wxpayback.api.CommonResult<java.lang.String>
+     * @author xue
+     * @date: 2025/3/24 9:28
+     */
     @GetMapping("/refundOrder")
     public CommonResult<String> refundOrder(@RequestParam("outTradeNo") String outTradeNo) {
         return process(() -> orderService.refundOrder(toolWxConfigService.findConf(), orderService.getById(outTradeNo)));

+ 1 - 2
src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelHisServiceImpl.java

@@ -55,13 +55,12 @@ public class ContractPlaceNumberRelHisServiceImpl extends ServiceImpl<ContractPl
 		// 获取当前登录角色
 		SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>()
 						.eq(SysUser::getId, SecurityUtils.getUserId()));
-
 		// 查询数据
 		LambdaQueryWrapper<ContractPlaceNumberRelHis> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.ge(StrUtil.isNotBlank(queryParams.getStartTimeBegin()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeBegin()).le(StrUtil.isNotBlank(queryParams.getStartTimeEnd()), ContractPlaceNumberRelHis::getStartTime, queryParams.getStartTimeEnd());
 		queryWrapper.ge(StrUtil.isNotBlank(queryParams.getEndTimeBegin()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeBegin()).le(StrUtil.isNotBlank(queryParams.getEndTimeEnd()), ContractPlaceNumberRelHis::getEndTime, queryParams.getEndTimeEnd());
 		queryWrapper.eq(StrUtil.isNotBlank(queryParams.getPhone()), ContractPlaceNumberRelHis::getPhone, queryParams.getPhone());
-		queryWrapper.eq(("3").equals(sysUser.getUserType()), ContractPlaceNumberRelHis::getContractId, queryParams.getContractId());
+		queryWrapper.eq(("3").equals(sysUser.getUserType()), ContractPlaceNumberRelHis::getContractId, sysUser.getContractId());
 		queryWrapper.orderByDesc(ContractPlaceNumberRelHis::getUpdateTime);
 
         // 查询数据

+ 2 - 1
src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -153,7 +153,8 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
             ContractPlaceNumberRelHis contractPlaceNumberRelHis = new ContractPlaceNumberRelHis();
             BeanUtils.copyProperties(form,contractPlaceNumberRelHis,"id");
             contractPlaceNumberRelHis.setStatus(form.getUpdateStatus());//0停用1启用 2到期 3新增 4删除 5修改
-            contractPlaceNumberRelHisService.save(contractPlaceNumberRelHis);
+            boolean save = contractPlaceNumberRelHisService.save(contractPlaceNumberRelHis);
+
         }
 
         return result;