Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Order/OrderService.php

@@ -1172,6 +1172,9 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderStateArray = array_column($orderList,'order_state');
 
         \Our\Log::getInstance()->write(json_encode($orderStateArray),'/data/log/apptest');
+        if(isset($data['wxLitePayFlag'])&&$data['wxLitePayFlag']==\Our\ApiConst::one){//微信小程序支付时
+            $oldOrderPay['pay_type'] = \Our\ApiConst::wxLitePayType;
+        }
         if(in_array(\Our\ApiConst::orderStateWaitPay,$orderStateArray)&&in_array($oldOrderPay['pay_type'],array(\Our\ApiConst::wxAppPayType,\Our\ApiConst::wxLitePayType))&&((isset($data['payFlag'])&&$data['payFlag']==\Our\ApiConst::one)||!isset($data['payFlag']))){
             \Our\Log::getInstance()->write($data['payFlag'],'/data/log/apptest');
             if($oldOrderPay['pay_type']==\Our\ApiConst::wxLitePayType){