活动：修改活动bug

game-server/app/services/orderService.ts

@@ -1,4 +1,4 @@
-import { UserOrderModel } from '../db/UserOrder';
+import { UserOrderModel, UserOrderModelType } from '../db/UserOrder';
 import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
 import { SignInData, SignInItem } from '../domain/activityField/signInField';
 import { ACTIVITY_TYPE, ORDER_STATE } from '../consts';
@@ -20,14 +20,12 @@ import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
  * 结算账单 
  * @param localOrderID 本地订单号
  */
-export async function makeOrder(localOrderID: string, sid: string) {
-    let orderInfo = await UserOrderModel.findOrder(localOrderID);
+export async function makeOrder(localOrderID: string, sid: string, orderInfo: UserOrderModelType) {
+    // let orderInfo = await UserOrderModel.findOrder(localOrderID);
     if (!orderInfo) {
         return '查无此订单';
     }
-    if (orderInfo.state == ORDER_STATE.RESULT_SUCCESS) {
-        return '结算过';
-    }
+
     //商品价格信息
     let productInfo = dicRMB.get(orderInfo.productID)
     if (!productInfo) {