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

Commit 158b0f6c authored by 胡佳晨's avatar 胡佳晨

提交 校园分销

parent dfe60898
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.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.SmilePriceParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
/**
* @author TT
*/
@Api(tags = "演出管理")
@Controller
@RequestMapping("/smile/show/base")
public class SmileShowBaseController extends BaseController {
private String prefix = "zhengzai/smile";
@Autowired
ISmileShowService smileShowService;
@GetMapping("/saleData/{performancesId}")
@ApiOperation("销售数据")
public String saleData(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
mmap.put("saleDataVo", saleDataVo);
return prefix + "/smileTickets/saleData";
}
}
...@@ -20,11 +20,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -20,11 +20,9 @@ import org.springframework.web.bind.annotation.*;
* @author TT * @author TT
*/ */
@Api(tags = "演出管理") @Api(tags = "演出管理")
@Controller @RestController
@RequestMapping("/smile/show") @RequestMapping("/smile/show")
public class SmileShowController extends BaseController { public class SmileShowController {
private String prefix = "zhengzai/smile";
@Autowired @Autowired
ISmileShowService smileShowService; ISmileShowService smileShowService;
...@@ -60,12 +58,4 @@ public class SmileShowController extends BaseController { ...@@ -60,12 +58,4 @@ public class SmileShowController extends BaseController {
return smileShowService.allPrice(smilePriceParam); return smileShowService.allPrice(smilePriceParam);
} }
@GetMapping("/saleData/{performancesId}")
@ApiOperation("销售数据")
public String saleData(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
mmap.put("saleDataVo", saleDataVo);
return prefix + "/smileTickets/saleData";
}
} }
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
var options = { var options = {
modalName: "销售数据", modalName: "销售数据",
url: smilePrefix + "/list", url: smilePrefix + "/list",
detailUrl: smilePrefix + "/saleData/{id}", detailUrl: smilePrefix + "/base/saleData/{id}",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
<tr class="content-tr"> <tr class="content-tr">
<td th:text="${item.username}"></td> <td th:text="${item.username}"></td>
<td th:text="${item.cityName}"></td> <td th:text="${item.cityName}"></td>
<!-- <td th:name="uid" th:text="${item.uid}" hidden="hidden"></td>-->
<td th:if="${item.type==1}" th:text="总代"></td> <td th:if="${item.type==1}" th:text="总代"></td>
<td th:if="${item.type==2}" th:text="普代"></td> <td th:if="${item.type==2}" th:text="普代"></td>
<td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td> <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
...@@ -68,46 +69,44 @@ ...@@ -68,46 +69,44 @@
<td th:text="${#aggregates.sum(item.dataAgentVos.![commission])}"></td> <td th:text="${#aggregates.sum(item.dataAgentVos.![commission])}"></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> <td th:if="${item.priceStatus==0}" th:text="已打款"></td>
<td th:if="${item.priceStatus!=0}" th:text="打款按钮"></td> <td th:if="${item.priceStatus!=0}">
<button type="button" class="btn btn-success btn-xs" th:onclick="submitHandler([[${item.uid}]])">
打款
</button>
</td>
</tr> </tr>
</div> </div>
</table> </table>
</div> </div>
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
修改
</button>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/> <th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript"> <script th:inline="javascript">
// var prefix = ctx + "kylin/performances"; var prefix = ctx + "smile/show";
$("#form-transfer-edit").validate({ $("#form-transfer-edit").validate({
focusCleanup: true focusCleanup: true
}); });
function submitHandler() { function submitHandler(uid) {
// var param = { var param = {
// performancesId: '[[${performanceTransferConfigVo.performancesId}]]'.replaceAll("\"", ""), performancesId: '[[${saleDataVo.performancesId}]]'.replaceAll("\"", ""),
// isCanTransfer: parseInt($("input[name^='performance_isCanTransfer']:checked").val()), uid: uid,
// transferStartTime: $("input[name^='transferStartTime']").val(), status: 1
// transferEndTime: $("input[name^='transferEndTime']").val() }
// }
// $.ajax({
// if ($("input[name^='transferStartTime']").val() == "" || $("input[name^='transferEndTime']").val() == "") { type: 'post',
// alert("定时时间不能为空"); url: prefix + "/price",
// } else { headers: {"Content-Type": "application/json;charset=UTF-8"},
// $.operate.post(prefix + "/transferConfig/change", data: JSON.stringify(param),
// param, success: function (e) {
// function (res) { alert(e.msg)
// alert(res.msg); location.reload();
// location.reload(); }
// }); });
// }
} }
</script> </script>
</body> </body>
......
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