账分消耗
This commit is contained in:
parent
16ebc54964
commit
5c1830548a
|
@ -1,6 +1,8 @@
|
||||||
package com.ruoyi.business.controller;
|
package com.ruoyi.business.controller;
|
||||||
|
|
||||||
|
import com.ruoyi.business.domain.BusAgentInfo;
|
||||||
import com.ruoyi.business.domain.BusIntegralRecord;
|
import com.ruoyi.business.domain.BusIntegralRecord;
|
||||||
|
import com.ruoyi.business.service.IBusAgentInfoService;
|
||||||
import com.ruoyi.business.service.IBusIntegralRecordService;
|
import com.ruoyi.business.service.IBusIntegralRecordService;
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
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 org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.sql.Wrapper;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,6 +31,8 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
{
|
{
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusIntegralRecordService busIntegralRecordService;
|
private IBusIntegralRecordService busIntegralRecordService;
|
||||||
|
@Autowired
|
||||||
|
private IBusAgentInfoService agentInfoService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询积分变更记录列表
|
* 查询积分变更记录列表
|
||||||
|
@ -35,12 +41,36 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(BusIntegralRecord busIntegralRecord)
|
public TableDataInfo list(BusIntegralRecord busIntegralRecord)
|
||||||
{
|
{
|
||||||
busIntegralRecord.setUpdateType("出账");
|
busIntegralRecord.setUpdateType("消耗账分");
|
||||||
startPage();
|
startPage();
|
||||||
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
|
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
|
||||||
return getDataTable(list);
|
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<BusAgentInfo> 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));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出积分变更记录列表
|
* 导出积分变更记录列表
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -9,3 +9,11 @@ export function listConsume(query) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function addRecord(data) {
|
||||||
|
return request({
|
||||||
|
url: '/system/consume',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,16 +24,16 @@
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<!-- <el-col :span="1.5">-->
|
<el-col :span="1.5">
|
||||||
<!-- <el-button-->
|
<el-button
|
||||||
<!-- type="primary"-->
|
type="primary"
|
||||||
<!-- plain-->
|
plain
|
||||||
<!-- icon="el-icon-plus"-->
|
icon="el-icon-plus"
|
||||||
<!-- size="mini"-->
|
size="mini"
|
||||||
<!-- @click="handleAdd"-->
|
@click="handleAdd"
|
||||||
<!-- v-hasPermi="['system:record:add']"-->
|
v-hasPermi="['system:record:add']"
|
||||||
<!-- >新增</el-button>-->
|
>新增</el-button>
|
||||||
<!-- </el-col>-->
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">-->
|
<!-- <el-col :span="1.5">-->
|
||||||
<!-- <el-button-->
|
<!-- <el-button-->
|
||||||
<!-- type="success"-->
|
<!-- type="success"-->
|
||||||
|
@ -111,25 +111,8 @@
|
||||||
<el-form-item label="营销账户" prop="account">
|
<el-form-item label="营销账户" prop="account">
|
||||||
<el-input v-model="form.account" placeholder="请输入营销账户" />
|
<el-input v-model="form.account" placeholder="请输入营销账户" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="平台" prop="platform">
|
<el-form-item label="消耗账分" prop="integralUpdateNum">
|
||||||
<el-input v-model="form.platform" placeholder="请输入平台" />
|
<el-input v-model="form.integralUpdateNum" placeholder="请输入消耗账分" />
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="积分变更数值" prop="integralUpdateNum">
|
|
||||||
<el-input v-model="form.integralUpdateNum" placeholder="请输入积分变更数值" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="变更时间" prop="integralUpdateTime">
|
|
||||||
<el-date-picker clearable
|
|
||||||
v-model="form.integralUpdateTime"
|
|
||||||
type="date"
|
|
||||||
value-format="yyyy-MM-dd"
|
|
||||||
placeholder="请选择变更时间">
|
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="积分余额" prop="integralBalance">
|
|
||||||
<el-input v-model="form.integralBalance" placeholder="请输入积分余额" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="代理备注" prop="agentRemark">
|
|
||||||
<el-input v-model="form.agentRemark" placeholder="请输入代理备注" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||||
|
@ -144,7 +127,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { listConsume } from "@/api/integral/consume";
|
import { listConsume, addRecord } from "@/api/integral/consume";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Consume",
|
name: "Consume",
|
||||||
|
|
Loading…
Reference in New Issue