diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java index c6765a5..b26addf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java @@ -1,6 +1,8 @@ package com.ruoyi.business.controller; +import com.ruoyi.business.domain.BusAgentInfo; import com.ruoyi.business.domain.BusIntegralRecord; +import com.ruoyi.business.service.IBusAgentInfoService; import com.ruoyi.business.service.IBusIntegralRecordService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -13,6 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.sql.Wrapper; +import java.util.Date; import java.util.List; /** @@ -27,6 +31,8 @@ public class BusIntegralConsumeController extends BaseController { @Autowired private IBusIntegralRecordService busIntegralRecordService; + @Autowired + private IBusAgentInfoService agentInfoService; /** * 查询积分变更记录列表 @@ -35,12 +41,36 @@ public class BusIntegralConsumeController extends BaseController @GetMapping("/list") public TableDataInfo list(BusIntegralRecord busIntegralRecord) { - busIntegralRecord.setUpdateType("出账"); + busIntegralRecord.setUpdateType("消耗账分"); startPage(); List list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord); return getDataTable(list); } + /** + * 新增积分变更记录 + */ + @PreAuthorize("@ss.hasPermi('system:record:add')") + @Log(title = "积分变更记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BusIntegralRecord busIntegralRecord) + { + BusAgentInfo agentInfo = new BusAgentInfo(); + agentInfo.setAgentAccount(busIntegralRecord.getAccount()); + List list = agentInfoService.selectBusAgentInfoList(agentInfo); + if (list.size() > 0){ + BusAgentInfo info = list.get(0); + String integral = String.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum().intValue()); + long integral1 = Long.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum().intValue()); + busIntegralRecord.setIntegralBalance(integral1); + info.setIntegral(integral); + agentInfoService.updateBusAgentInfo(info); + } + busIntegralRecord.setUpdateType("消耗账分"); + busIntegralRecord.setIntegralUpdateTime(new Date()); + return toAjax(busIntegralRecordService.insertBusIntegralRecord(busIntegralRecord)); + } + /** * 导出积分变更记录列表 */ diff --git a/ruoyi-ui/src/api/integral/consume.js b/ruoyi-ui/src/api/integral/consume.js index e7160ab..d2d06c2 100644 --- a/ruoyi-ui/src/api/integral/consume.js +++ b/ruoyi-ui/src/api/integral/consume.js @@ -9,3 +9,11 @@ export function listConsume(query) { }) } +export function addRecord(data) { + return request({ + url: '/system/consume', + method: 'post', + data: data + }) +} + diff --git a/ruoyi-ui/src/views/point/consume/index.vue b/ruoyi-ui/src/views/point/consume/index.vue index 8ec1fe8..8fda127 100644 --- a/ruoyi-ui/src/views/point/consume/index.vue +++ b/ruoyi-ui/src/views/point/consume/index.vue @@ -24,16 +24,16 @@ - - - - - - - - - - + + 新增 + @@ -111,25 +111,8 @@ - - - - - - - - - - - - - - - + + @@ -144,7 +127,7 @@