|
@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
*/
|
|
@@ -84,7 +86,11 @@ class PcWxController extends BaseController {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
dto.setSchoolName(user.getUserId()==1l? dto.getSchoolName(): user.getNickName());
|
|
|
List<WxSchoolOrder> list = wxOrderService.QuerySchoolOrderList(dto);
|
|
|
- return toResponsePageInfo(list);
|
|
|
+ ResponsePageInfo<WxSchoolOrder> pageData = toResponsePageInfo(list);
|
|
|
+ Map mapData = new HashMap<>();
|
|
|
+ mapData.put("totalPay",wxOrderService.getTotalPay(dto));
|
|
|
+ pageData.setOtherData(mapData);
|
|
|
+ return pageData;
|
|
|
}
|
|
|
|
|
|
|