zs 1 vuosi sitten
vanhempi
commit
c7f0caaf27
2 muutettua tiedostoa jossa 13 lisäystä ja 9 poistoa
  1. 12 8
      src/service/OrderDetail.service.ts
  2. 1 1
      src/service/User.service.ts

+ 12 - 8
src/service/OrderDetail.service.ts

@@ -9,6 +9,10 @@ import { User } from '../entity/User.entity';
 import _ = require('lodash');
 import { Order } from '../entity/Order.entity';
 type modelType = ReturnModelType<typeof OrderDetail>;
+interface formInterface {
+  _id: string;
+  status?: string;
+}
 @Provide()
 export class OrderDetailService extends BaseService<modelType> {
   @InjectEntityModel(OrderDetail)
@@ -39,8 +43,8 @@ export class OrderDetailService extends BaseService<modelType> {
       status,
       ...info
     } = filter;
-    let list: any = [];
-    let total: any = 0;
+    let list = [];
+    let total = 0;
     if (s_leader) info.s_leader = { $elemMatch: { _id: s_leader } };
     else if (s_accounting)
       info.s_accounting = { $elemMatch: { _id: s_accounting } };
@@ -120,8 +124,8 @@ export class OrderDetailService extends BaseService<modelType> {
   }
   async money(filter): Promise<object> {
     const { skip = 0, limit, goods, ...info } = filter;
-    let list: any = [];
-    let total: any = 0;
+    let list = [];
+    let total = 0;
     if (goods) {
       const arr = await this.goodModel
         .findOne({
@@ -223,7 +227,7 @@ export class OrderDetailService extends BaseService<modelType> {
     if (s_accounting) {
       const saccounting = [];
       for (const val of res.s_accounting) {
-        const form: any = { _id: val._id };
+        const form: formInterface = { _id: val._id };
         if (val._id === s_accounting) {
           if (status === '2') form.status = '1';
           else form.status = '-1';
@@ -256,7 +260,7 @@ export class OrderDetailService extends BaseService<modelType> {
     } else if (c_accounting) {
       const caccounting = [];
       for (const val of res.c_accounting) {
-        const form: any = { _id: val._id };
+        const form: formInterface = { _id: val._id };
         if (val._id === c_accounting) {
           if (status === '7') form.status = '1';
           else form.status = '-1';
@@ -289,7 +293,7 @@ export class OrderDetailService extends BaseService<modelType> {
     } else if (s_leader) {
       const sleader = [];
       for (const val of res.s_leader) {
-        const form: any = { _id: val._id };
+        const form: formInterface = { _id: val._id };
         if (val._id === s_leader) {
           if (status === '4') form.status = '1';
           else form.status = '-1';
@@ -322,7 +326,7 @@ export class OrderDetailService extends BaseService<modelType> {
     } else if (c_leader) {
       const cleader = [];
       for (const val of res.c_leader) {
-        const form: any = { _id: val._id };
+        const form: formInterface = { _id: val._id };
         if (val._id === c_leader) {
           if (status === '8') form.status = '1';
           else form.status = '-1';

+ 1 - 1
src/service/User.service.ts

@@ -41,7 +41,7 @@ export class UserService extends BaseService<modelType> {
       );
     return user;
   }
-  async wxLogin(openid: any): Promise<object> {
+  async wxLogin(openid: string): Promise<object> {
     const user = await this.model.findOne({ openid }).lean();
     if (!user)
       throw new ServiceError(