提交代码

.gitignore

@@ -2,3 +2,7 @@
 /.idea/
 /jeecg-boot-base/jeecg-boot-base-tools/target/
 /.idea
+/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target
+/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target
+/jeecg-boot-base/jeecg-boot-base-tools/target
+/jeecg-boot-base/jeecg-boot-base-core/target

admin-hanhai-vue/src/views/system/RefundOrderList.vue

@@ -88,11 +88,19 @@
             </template>
 
             <span slot="action" slot-scope="text, record">
+              <div v-if="record.status === 13">
+                <a @click="handleConfirmOrder(record)">确认收货</a>
+                <a-divider type="vertical"/>
+              </div>
+              <div v-if="record.status === 14">
+                <a @click="handleRefundOrder(record)">确认退货</a>
+                <a-divider type="vertical"/>
+              </div>
           <a @click="handleOpen(record)">订单详情</a>
             <a-divider type="vertical"/>
-          <a @click="handleEdit(record)">编辑</a>
+<!--          <a @click="handleEdit(record)">编辑</a>-->
 
-          <a-divider type="vertical" />
+<!--          <a-divider type="vertical" />-->
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -208,7 +216,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HotelOrderModal from './modules/HotelOrderModal'
   import HotelOrderDetailModal from './modules/HotelOrderDetailModal'
-  import {getAction} from "@api/manage";
+  import {getAction, httpAction} from "@api/manage";
   import {filterObj} from "@/utils/util";
 
   export default {
@@ -336,7 +344,8 @@
           exportXlsUrl: "/hotelorder/hotelOrder/exportXls",
           importExcelUrl: "hotelorder/hotelOrder/importExcel",
           detailList: "/hotelorderdetail/hotelOrderDetail/list",
-
+          refundConfirmOrder: "/hotelorder/hotelOrder/refund/confirm",
+          refundOrder: "/hotelorder/hotelOrder/refund"
         },
         dictOptions:{},
         superFieldList:[],
@@ -531,6 +540,18 @@
         // 新增/修改 成功时，重载列表
         this.loadData2()
       },
+      //确认收货
+      handleConfirmOrder(obj){
+        httpAction(this.url.refundConfirmOrder,obj,'post').then((res)=>{
+          this.loadData();
+        })
+      },
+      //确认退货
+      handleRefundOrder(obj){
+        httpAction(this.url.refundOrder,obj,'post').then((res)=>{
+          this.loadData();
+        })
+      },
     }
   }
 </script>

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-cloud-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,3 +0,0 @@
-org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.class
-org\jeecg\common\system\api\ISysBaseAPI.class
-org\jeecg\common\system\api\fallback\SysBaseAPIFallback.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +0,0 @@
-D:\project\hanhai-object-jdbc-20240829\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\project\hanhai-object-jdbc-20240829\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
-D:\project\hanhai-object-jdbc-20240829\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
-D:\project\hanhai-object-jdbc-20240829\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-local-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-org\jeecg\common\system\api\ISysBaseAPI.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-D:\project\hanhai-object-jdbc-20240829\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/controller/HotelOrderController.java

@@ -15,6 +15,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.hotelbalancelog.entity.HotelBalanceLog;
 import org.jeecg.modules.hotelbalancelog.service.IHotelBalanceLogService;
 import org.jeecg.modules.hotelconf.service.IHotelConfService;
@@ -77,6 +79,8 @@ public class HotelOrderController extends JeecgController<HotelOrder, IHotelOrde
 	private IHotelLeaseLogService hotelLeaseLogService;
 	@Resource
 	private IHotelOrderDetailService hotelOrderDetailService;
+	@Resource
+	private IHanHaiMemberService hanHaiMemberService;
 	
 	/**
 	 * 分页列表查询
@@ -494,4 +498,49 @@ public class HotelOrderController extends JeecgController<HotelOrder, IHotelOrde
 		 return Result.OK();
 	 }
 
+
+	 /**
+	  * 退货订单收货
+	  * @param hotelOrder
+	  * @return
+	  */
+	 @Transactional(rollbackFor = Exception.class)
+	 @RequestMapping(value = "/refund/confirm", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<?> refundConfirmOrder(@RequestBody HotelOrder hotelOrder){
+		 hotelOrder.setStatus(14);
+		 hotelOrderService.updateById(hotelOrder);
+		 return Result.OK();
+	 }
+
+	 @RequestMapping(value = "/refund", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<?> refundOrder(@RequestBody HotelOrder hotelOrder){
+		 hotelOrder.setStatus(15);
+		 hotelOrderService.updateById(hotelOrder);
+
+		 HanHaiMember hanHaiMember = hanHaiMemberService.lambdaQuery()
+				 .eq(HanHaiMember::getId, hotelOrder.getUserId())
+				 .one();
+
+		 HotelMemberAccount hotelMemberAccount = hotelMemberAccountService.lambdaQuery()
+				 .eq(HotelMemberAccount::getDelFlag, 0)
+				 .eq(HotelMemberAccount::getUserId, hanHaiMember.getId())
+				 .one();
+
+		 HotelMemberAccount hotelMemberAccount1 = new HotelMemberAccount();
+		 hotelMemberAccount1.setId(hotelMemberAccount.getId());
+		 hotelMemberAccount1.setDeposit(hotelMemberAccount.getDeposit().subtract(hotelOrder.getDeposit()));
+		 hotelMemberAccountService.updateById(hotelMemberAccount1);
+
+		 HotelBalanceLog hotelBalanceLog = new HotelBalanceLog();
+		 hotelBalanceLog.setBalance(hotelOrder.getDeposit());
+		 hotelBalanceLog.setUserBalance(hotelMemberAccount.getDeposit());
+		 hotelBalanceLog.setOrderId(hotelOrder.getId());
+		 hotelBalanceLog.setPayType(1);
+		 hotelBalanceLog.setUserId(hanHaiMember.getId());
+		 hotelBalanceLog.setTitle("租赁押金退还");
+		 hotelBalanceLogService.save(hotelBalanceLog);
+
+		 return Result.OK();
+	 }
+
 }