记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 02550d85 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

校园分销 销售数据

parent 3984a402
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 11 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java
View file @ 02550d85
package com.liquidnet.client.admin.web.controller.zhengzai.smile; package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SaleDataVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort; import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam; import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam; import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
...@@ -10,15 +12,19 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService; ...@@ -10,15 +12,19 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* @author TT * @author TT
*/ */
@Api(tags = "演出管理") @Api(tags = "演出管理")
@RestController @Controller
@RequestMapping("/smile/show") @RequestMapping("/smile/show")
public class SmileShowController { public class SmileShowController extends BaseController {
private String prefix = "zhengzai/smile";
@Autowired @Autowired
ISmileShowService smileShowService; ISmileShowService smileShowService;
...@@ -50,13 +56,16 @@ public class SmileShowController { ...@@ -50,13 +56,16 @@ public class SmileShowController {
@PostMapping("/allPrice") @PostMapping("/allPrice")
@ApiOperation("演出标识打款") @ApiOperation("演出标识打款")
public AjaxResult allPrice(@RequestBody SmilePriceParam smilePriceParam){ public AjaxResult allPrice(@RequestBody SmilePriceParam smilePriceParam) {
return smileShowService.allPrice(smilePriceParam); return smileShowService.allPrice(smilePriceParam);
} }
@PostMapping("/saleData") @GetMapping("/saleData/{performancesId}")
@ApiOperation("销售数据") @ApiOperation("销售数据")
public AjaxResult saleData(String performancesId){ public String saleData(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
return smileShowService.saleData(performancesId); SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
mmap.put("saleDataVo", saleDataVo);
return prefix + "/smileTickets/saleData";
} }
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/list.html
View file @ 02550d85
...@@ -98,7 +98,9 @@ ...@@ -98,7 +98,9 @@
var subOArr = []; var subOArr = [];
$(function () { $(function () {
var options = { var options = {
modalName: "销售数据",
url: smilePrefix + "/list", url: smilePrefix + "/list",
detailUrl: smilePrefix + "/saleData/{id}",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
...@@ -158,6 +160,7 @@ ...@@ -158,6 +160,7 @@
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>销售数据</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html 0 → 100644
View file @ 02550d85
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('销售数据')"/>
<th:block th:include="include :: datetimepicker-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-transfer-edit" th:object="${saleDataVo}">
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出id：</label>
<div class="col-sm-8">
<input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出名称：</label>
<div class="col-sm-8">
<input name="title" th:field="*{title}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">票提设置：</label>
<table id="team-table" class="table table-condensed table-sm" th:border="1">
<tr>
<td>总代票提</td>
<td>普代票提</td>
<tr/>
<div th:each="item : *{showAgentVoList}">
<tr class="content-tr">
<td th:text="${item.totalCarry}">
</td>
<td th:text="${item.ordCarry}">
</td>
</tr>
</div>
</table>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">代理数据：</label>
<table id="team-table2" class="table table-condensed table-sm" th:border="1">
<tr>
<td>姓名</td>
<td>所属地区</td>
<td>身份</td>
<div th:each="item : *{showAgentVoList}">
<td th:text="${item.title}"></td>
</div>
<td>总销售张数</td>
<td>总销售金额</td>
<td>票提</td>
<td>打款状态</td>
<td>操作</td>
<tr/>
<div th:each="item : *{userDataList}">
<tr class="content-tr">
<td th:text="${item.username}"></td>
<td th:text="${item.cityName}"></td>
<td th:if="${item.type==1}" th:text="总代"></td>
<td th:if="${item.type==2}" th:text="普代"></td>
<div th:each="itemAgent : ${item.dataAgentVos}">
<td th:text="${itemAgent.number}"></td>
</div>
<td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.price}"></td>
<td th:if="${item.priceStatus!=0}" th:text="待打款"></td>
<td th:if="${item.priceStatus==0}" th:text="已打款"></td>
<td th:if="${item.priceStatus!=0}" th:text="打款按钮"></td>
</tr>
</div>
</table>
</div>
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
修改
</button>
</form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript">
// var prefix = ctx + "kylin/performances";
$("#form-transfer-edit").validate({
focusCleanup: true
});
function submitHandler() {
// var param = {
// performancesId: '[[${performanceTransferConfigVo.performancesId}]]'.replaceAll("\"", ""),
// isCanTransfer: parseInt($("input[name^='performance_isCanTransfer']:checked").val()),
// transferStartTime: $("input[name^='transferStartTime']").val(),
// transferEndTime: $("input[name^='transferEndTime']").val()
// }
//
// if ($("input[name^='transferStartTime']").val() == "" || $("input[name^='transferEndTime']").val() == "") {
// alert("定时时间不能为空");
// } else {
// $.operate.post(prefix + "/transferConfig/change",
// param,
// function (res) {
// alert(res.msg);
// location.reload();
// });
// }
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java
View file @ 02550d85
...@@ -4,6 +4,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service; ...@@ -4,6 +4,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SaleDataVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort; import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam; import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam; import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
...@@ -52,7 +53,7 @@ public interface ISmileShowService extends IService<SmileSchool> { ...@@ -52,7 +53,7 @@ public interface ISmileShowService extends IService<SmileSchool> {
* @param performancesId： 演出id * @param performancesId： 演出id
* @return ：AjaxResult * @return ：AjaxResult
*/ */
AjaxResult saleData(String performancesId); SaleDataVo saleData(String performancesId);
/** /**
* 演出标识打款 * 演出标识打款
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @ 02550d85
...@@ -261,7 +261,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -261,7 +261,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
} }
@Override @Override
public AjaxResult saleData(String performancesId) { public SaleDataVo saleData(String performancesId) {
SaleDataVo saleDataVo = new SaleDataVo(); SaleDataVo saleDataVo = new SaleDataVo();
//演出id //演出id
saleDataVo.setPerformancesId(performancesId); saleDataVo.setPerformancesId(performancesId);
...@@ -269,12 +269,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -269,12 +269,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
saleDataVo.setPriceStatus(smileRedisUtils.getShowPriceId(performancesId)); saleDataVo.setPriceStatus(smileRedisUtils.getShowPriceId(performancesId));
List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId); List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId);
if (smileAgents == null) { if (smileAgents == null) {
return AjaxResult.error("该演出未开启代理"); return null;
} }
//演出名称 //演出名称
KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
if (kylinPerformanceVo == null) { if (kylinPerformanceVo == null) {
return AjaxResult.warn("演出未找到"); return null;
} }
saleDataVo.setTitle(kylinPerformanceVo.getTitle()); saleDataVo.setTitle(kylinPerformanceVo.getTitle());
//map 票提id，票提信息 //map 票提id，票提信息
...@@ -300,7 +300,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -300,7 +300,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
} }
saleDataVo.setUserDataList(userDataList); saleDataVo.setUserDataList(userDataList);
saleDataVo.setShowAgentVoList(showAgentVoList); saleDataVo.setShowAgentVoList(showAgentVoList);
return AjaxResult.success(saleDataVo); return saleDataVo;
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment