java/mx_charging_pile.git

			@@ -12,6 +12,8 @@
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.log.annotation.Log;
			import com.ruoyi.common.log.enums.BusinessType;
			import com.ruoyi.common.security.annotation.Logical;
			import com.ruoyi.common.security.annotation.RequiresPermissions;
			import com.ruoyi.order.api.model.TExchangeOrder;
			import com.ruoyi.order.api.model.TShoppingOrder;
			import com.ruoyi.order.api.model.TVipOrder;
			@@ -55,6 +57,12 @@
			private TVipOrderService vipOrderService;
			@Resource
			private AppUserClient appUserClient;
			@Resource
			private OtherClient otherClient;



			@RequiresPermissions(value = {"/vipOrder"}, logical = Logical.OR)
			@PostMapping("/getVipOrderList")
			@ApiOperation(value = "列表查询", tags = {"管理后台-会员订单"})
			public AjaxResult<PageInfo<TVipOrder>> getVipOrderList(@RequestBody VipShoppingOrderQuery query) {
			@@ -67,6 +75,9 @@
			PageInfo<TVipOrder> res = vipOrderService.pageList(query);
			return AjaxResult.success(res);
			}


			@RequiresPermissions(value = {"/vipOrder/add"}, logical = Logical.OR)
			@PostMapping("/addVipOrder")
			@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
			public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
			@@ -81,12 +92,17 @@
			vipOrderService.saveOrUpdate(dto);
			return R.ok(dto.getId());
			}


			@RequiresPermissions(value = {"/vipOrder/del"}, logical = Logical.OR)
			@GetMapping("/deleteVipOrder")
			@ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
			public AjaxResult deleteVipOrder(String id) {
			vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
			return AjaxResult.success();
			}



			@PostMapping("/callBack")
			public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
			@@ -109,8 +125,7 @@
			}


			@Resource
			private OtherClient otherClient;


			@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "导出")
			@PutMapping(value = "/export")