|
|
@@ -464,12 +464,14 @@ class ShopController extends BaseController {
|
|
|
->where('SN=:SN', [':SN' => $orderSn])
|
|
|
->select('O.*,U.REAL_NAME,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
|
|
|
->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
|
|
|
- ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
|
|
|
+ ->join('RIGHT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
|
|
|
->asArray()
|
|
|
->all();
|
|
|
|
|
|
+ LoggerTool::info($order);
|
|
|
+
|
|
|
if (!$order) {
|
|
|
- return static::notice('订单【' . $orderSn . '】不存');
|
|
|
+ return static::notice('订单【' . $orderSn . '】不存在');
|
|
|
}
|
|
|
if ($order['SEND_AT'] > 0) {
|
|
|
return static::notice('订单【' . $orderSn . '】不可重复推送');
|
|
|
@@ -513,7 +515,7 @@ class ShopController extends BaseController {
|
|
|
)
|
|
|
->select('O.*,U.REAL_NAME,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
|
|
|
->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
|
|
|
- ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
|
|
|
+ ->join('RIGHT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
|
|
|
->asArray()
|
|
|
->all();
|
|
|
|