zhangguidong 2 年之前
父節點
當前提交
f0c3849dd0
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 3 0
      app/data/controller/api/business/Order.php
  2. 3 2
      app/data/service/PaymentService.php

+ 3 - 0
app/data/controller/api/business/Order.php

@@ -2,6 +2,7 @@
 
 namespace app\data\controller\api\business;
 use app\data\model\DataUser;
+use app\data\model\ShopGoodsItem;
 use app\data\model\ShopOrder;
 use app\data\model\ShopOrderItem;
 use app\data\model\ShopOrderSend;
@@ -12,6 +13,8 @@ use hg\apidoc\annotation\Method;
 use hg\apidoc\annotation\Param;
 use hg\apidoc\annotation\Returned;
 use Yansongda\Pay\Pay;
+use app\data\model\ShopGoods;
+use app\data\model\ShopOrderPay;
 
 /**
  * 商家订单数据接口

+ 3 - 2
app/data/service/PaymentService.php

@@ -10,6 +10,7 @@ use app\data\model\ShopGoods;
 use app\data\model\ShopOrder;
 use app\data\model\ShopOrderItem;
 use app\data\model\ShopOrderPay;
+use app\data\model\ShopGoodsItem;
 use app\data\service\payment\AlipayPaymentService;
 use app\data\service\payment\BalancePaymentService;
 use app\data\service\payment\EmptyPaymentService;
@@ -364,8 +365,8 @@ abstract class PaymentService
         $order_nos = ShopOrder::mk()->where(['payment_trade'=>$orderNo])->field('order_no')->select();
         foreach ($order_nos as &$v){
             $info = ShopOrderItem::mk()->where('order_no',$v['order_no'])->field('goods_code,goods_sku,stock_sales')->find();
-            $goods = ShopGoods::mk()->where('pay_no',$info['goods_code'])->findOrEmpty();
-            $item = ShopGoods::mk()->where('pay_no',$info['goods_sku'])->findOrEmpty();
+            $goods = ShopGoods::mk()->where('code',$info['goods_code'])->findOrEmpty();
+            $item = ShopGoodsItem::mk()->where('goods_sku',$info['goods_sku'])->findOrEmpty();
             $goods->stock_total -=$info['stock_sales'];
             $item->stock_total -=$info['stock_sales'];
             $goods->save();