From 9a56c5710eb281afc06e2f3a211b8b595f24bbe1 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:39:34 +0800
Subject: [PATCH] update
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
index e35af56..6c00995 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBillController.java
@@ -6,11 +6,14 @@
import com.stylefeng.guns.modular.system.controller.util.ExcelUtil;
import com.stylefeng.guns.modular.system.enums.TBillStateEnum;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TOrder;
+import com.stylefeng.guns.modular.system.service.ITOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -45,6 +48,8 @@
@Autowired
private ITBillService tBillService;
+ @Autowired
+ private ITOrderService tOrderService;
/**
* 跳转到首页
@@ -79,12 +84,13 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String createTime,String addresseePhone,Integer state,Integer billType,Integer billHeaderType) {
- EntityWrapper<TBill> wrapper = tBillService.getPageListWrapper(createTime,addresseePhone,state,billType,billHeaderType);
- return tBillService.selectList(wrapper);
+// EntityWrapper<TBill> wrapper = tBillService.getPageListWrapper(createTime,addresseePhone,state,billType,billHeaderType);
+// return tBillService.selectList(wrapper);
+ return tBillService.getPageList(createTime,addresseePhone,state,billType,billHeaderType);
}
/**
- * 详情
+ * 确认通过发票
*/
@RequestMapping(value = "/confirm")
@ResponseBody
@@ -96,7 +102,7 @@
}
/**
- * 详情
+ * 开通发票失败
*/
@RequestMapping(value = "/cancel")
@ResponseBody
@@ -104,6 +110,11 @@
TBill tBill = tBillService.selectById(tBillId);
tBill.setState(TBillStateEnum.FAIL_BILL.getCode());
tBillService.updateById(tBill);
+ TOrder tOrder = tOrderService.selectById(tBill.getOrderId());
+ if(Objects.nonNull(tOrder)){
+ tOrder.setIsInvoice(0);
+ tOrderService.updateById(tOrder);
+ }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1