lrf 1 anno fa
parent
commit
918fe855be

+ 4 - 2
src/controller/dining/order.controller.ts

@@ -18,7 +18,8 @@ export class OrderController extends BaseController {
   @Post('/mealCard/:openid')
   async mealCard(@Param('openid') openid: string) {
     const data = await this.service.mealCard(openid);
-    return data;
+    const result = new FVO_order(data);
+    return result;
   }
 
   @Get('/getByOpenid')
@@ -31,7 +32,8 @@ export class OrderController extends BaseController {
   @Get('/getMeal/:id')
   async getMeal(@Param('id') id: string) {
     const data = await this.service.getMeal(id);
-    return data;
+    const result = new FVO_order(data);
+    return result;
   }
 
   @Post('/')

+ 1 - 0
src/entity/dining/order.entity.ts

@@ -4,6 +4,7 @@ import { Types } from 'mongoose';
 const ObjectId = Types.ObjectId;
 // 处理三餐数据: 没有is_use就填上; 没有_id就填上
 const mealDeal = (val: object) => {
+  if (!val) return val;
   const obj: any = {};
   if (!('is_use' in val)) {
     obj.is_use = false;

+ 1 - 1
src/interface/dining/arrange.interface.ts

@@ -25,7 +25,7 @@ export class FVO_arrange {
 export class QDTO_arrange extends SearchBase {
   constructor() {
     const like_prop = [];
-    const props = [];
+    const props = ['date@start','date@end'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }

+ 1 - 1
src/interface/dining/order.interface.ts

@@ -31,7 +31,7 @@ export class FVO_order {
 export class QDTO_order extends SearchBase {
   constructor() {
     const like_prop = [];
-    const props = [];
+    const props = ['date@start','date@end'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }

+ 2 - 2
src/service/weixin.service.ts

@@ -12,8 +12,8 @@ export class WeixinService {
   ctx: Context;
 
   async appAuth() {
-    const body = this.ctx.request.body;
-    const js_code = get(body, 'js_code');
+    const query = this.ctx.query;
+    const js_code = get(query, 'js_code');
     const { appid, secret } = this.weixinConfig;
     const url = `https://api.weixin.qq.com/sns/jscode2session?appid=${appid}&secret=${secret}&js_code=${js_code}&grant_type=authorization_code`;
     const result = await makeHttpRequest(url, {