Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/store/order/StoreOrderRepository.php

@@ -91,6 +91,10 @@ class StoreOrderRepository extends BaseRepository
     private $source;
     private $merId;
 
+    const commercetrade_cash_integral = 'commercetrade_cash_integral'; // 商贸区：现金+积分
+    const commercetrade_cash_peking_bean = 'commercetrade_cash_peking_bean'; // 商贸区：现金+京豆
+    const commercetrade_cash = 'commercetrade_cash'; // 商贸区：现金
+
     /**
      * StoreOrderRepository constructor.
      * @param StoreOrderDao $dao
@@ -1963,7 +1967,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/9
      */
-    public function cartIdByOrderInfo($uid, array $cartId, int $addressId = null, $confirm = true, $psType = true, $payType = 0, $youhui_price_key = '')
+    public function cartIdByOrderInfo($uid, array $cartId, int $addressId = null, $confirm = true, $psType = true, $payType = 0, $youhui_price_key = '',$is_commercetrade=0)
     {
         $address = null;
         if ($psType) {//是否需要地址
@@ -2356,6 +2360,64 @@ class StoreOrderRepository extends BaseRepository
                     ['type' => 'c1', 'price' => $orderpri, 'other' => 0, 'note' => "复购金"],
                 ];
 
+            }// 商贸区
+            elseif ($is_commercetrade){
+
+                $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
+                $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
+                if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
+                    $yanglao = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $pv = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $srtArry['jfduihuan'] = $jf;
+                    $srtArry['jdduihuan'] = $jd;
+                    $jifen = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $gongxian = round($store_product_datas['concession_pri'] * 0.35, 2);
+
+                    $jcvr = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
+                    $jcjf = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $jcprice = round($orderpri - round($store_product_datas['concession_pri'] * 0.3, 2), 2);
+                    $jcjf1 = round($store_product_datas['concession_pri'] * 0.3, 2);
+                    $jcvr1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
+                    $jcjd = round($store_product_datas['concession_pri'] * 0.35, 2);
+                    $jcprice1 = round($orderpri - round($store_product_datas['concession_pri'] * 0.35, 2), 2);
+                    $jcjd1 = round($store_product_datas['concession_pri'] * 0.35, 2);
+
+                    //var_dump($cartInfo['list'][$_k]);
+                    //支付组合
+                    // $fzone_paytype= [
+
+                    //     2=>[
+                    //         1=>[$jcvr,$jcjf],//VR+积分
+                    //         2=>[$jcprice,$jcjf1],//现金+积分
+                    //         3=>[$jcvr1,$jcjd],//VR+京豆
+                    //         4=>[$jcprice1,$jcjd1],//现金+金豆
+                    //         5=>$orderpri,//VR
+                    //         6=>$orderpri,//现金
+                    //     ]
+                    // ];
+
+                    $cartInfo['list'][$_k]['fzone_paytype'] = [
+
+                        // ['type'=>'a1','price'=>100,'other'=>0,'note'=>"VR"],
+                        // ['type'=>'a2','price'=>100,'other'=>0,"note"=>"现金"],
+                        // ['type'=>'a3','price'=>0,'other'=>0,"note"=>"现金+VR"],
+
+//                        ['type' => 'b1', 'price' => $jcvr, 'other' => $jcjf, 'note' => "VR+积分"],
+                        ['type' => 'b2', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
+                        // ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd,"note"=>"VR+京豆"],
+                        ['type'=>'b4','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
+//                        ['type' => 'b5', 'price' => $orderpri, 'other' => 0, "note" => "VR"],
+                        ['type' => 'b6', 'price' => $orderpri, 'other' => 0, "note" => "现金"],
+
+                        // ['type'=>'c1','price'=>100,'other'=>0,'note'=>"复购金"],
+                        // ['type'=>'c2','price'=>100,'other'=>0,"note"=>"VR"],
+                        // ['type'=>'c3','price'=>100,'other'=>0,"note"=>"现金"],
+
+
+                    ];
+
+
+                }
             }
 
 
@@ -6544,6 +6606,7 @@ class StoreOrderRepository extends BaseRepository
 
     public function douhuomall_delivery()
     {
+        set_time_limit(0);
         try {
             $order = Db::name('store_order')->where('status', 0)->where('pay_type', '>', 0)->where('douhuomall', 1)->where('douhuomall_status', 9)->select();
             if ($order) {
@@ -6572,7 +6635,7 @@ class StoreOrderRepository extends BaseRepository
 //                        $address_id = $address_id[0];
                     }
 //                    $address_id = $value['address_id'];
-                    $cart_id = $value['cart_id'];
+                    $cart_id = [$value['cart_id']];
                     $cartIds = Db::name('store_cart')->where('cart_id', 'in', $cart_id)->select()->toArray();
 //                    $address = $value['user_address'];
                     log::info("传参数据22========");
@@ -6591,7 +6654,7 @@ class StoreOrderRepository extends BaseRepository
                         log::info("传参数据11111========");
                         log::info($address);
                         $res = GongApiRequest::submit($address_id, $sku_id, $address, $third_order, $other, $receiver, $receiver_phone);
-
+                        echo "传参数据11111========";
                         $u['douhuomall_status'] = 0;
                         $u['douhuomall_msg'] = $res['error_msg'] ?? '';
                         if ($res['error_code'] == 0) {
@@ -6611,6 +6674,7 @@ class StoreOrderRepository extends BaseRepository
             $this->douhuomall_order();
         } catch (Exception $e) {
             Db::name('log')->insert(['data' => '供应链发货：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            echo '供应链发货：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
         }
     }
 

app/common/repositories/store/product/ProductAttrValueRepository.php

@@ -122,6 +122,7 @@ class ProductAttrValueRepository extends BaseRepository
         //查询商品是否有货
         $stock = GongApiRequest::stock($sku_id,$address_id,$num);
         if($stock != '有货'){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品无货']);
             if($delivery){
                 return false;
             }else{
@@ -132,6 +133,7 @@ class ProductAttrValueRepository extends BaseRepository
         //查询商品上下架
         $goods_status = GongApiRequest::goods_status($spu_id);
         if(!isset($goods_status[0]['status']) || $goods_status[0]['status'] != 1){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品已下架'.json_encode($goods_status)]);
             if($delivery){
                 return false;
             }else{
@@ -142,6 +144,7 @@ class ProductAttrValueRepository extends BaseRepository
         //查询库存
         $sku_stock = GongApiRequest::sku_stock(json_encode($sku),$address_id);
         if(!isset($sku_stock[0]['stock']) || $sku_stock[0]['stock'] != '有货'){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品规格无货']);
             if($delivery){
                 return false;
             }else {

app/common/repositories/store/product/ProductRepository.php

@@ -11,6 +11,7 @@ use app\common\model\store\order\StoreOrder;
 use app\common\model\store\product\Product;
 use app\common\model\store\product\ProductContent;
 use app\common\model\user\User;
+use app\common\repositories\merchant\MerchantRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\order\StoreRefundOrderRepository;
@@ -1755,6 +1756,44 @@ class ProductRepository extends BaseRepository
                         3=>$product['price']//复购金
                     ]
                 ];
+            } else {
+                // 商贸区
+                /** @var MerchantRepository $merchant */
+                $merchant = app()->make(MerchantRepository::class);
+                $merchantInfo = $merchant->get($product['mer_id']);
+                // 1企业2个体3个人
+                if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
+                    //商贸区
+                    $jf = $product['price'] - round($product['concession_pri']*0.3, 2) . ' + ' . round($product['concession_pri']*0.3, 2);
+                    $jd = $product['price'] - round($product['concession_pri']*0.35, 2) . ' + ' . round($product['concession_pri']*0.35, 2);
+                    if($product['concession_pri'] !=null || $product['concession_pri'] !=0){
+                        $yanglao = round($product['concession_pri'] * 0.3, 2);
+                        $pv = round($product['concession_pri'] * 0.35, 2);
+                        $srtArry['jfduihuan'] =$jf;
+                        $srtArry['jdduihuan'] = $jd;
+                        $jifen = round($product['concession_pri'] * 0.35, 2);
+                        $gongxian = round($product['concession_pri'] * 0.35, 2);
+
+                        $jcvr = $product['price'] - round($product['concession_pri']*0.3, 2);
+                        $jcjf = round($product['concession_pri']*0.3, 2);
+                        $jcprice = $product['price'] - round($product['concession_pri']*0.3, 2);
+                        $jcjf1 = round($product['concession_pri']*0.3, 2);
+                        $jcvr1 = $product['price'] - round($product['concession_pri']*0.35, 2);
+                        $jcjd = round($product['concession_pri']*0.35, 2);
+                        $jcprice1 = $product['price'] - round($product['concession_pri']*0.35, 2);
+                        $jcjd1 = round($product['concession_pri']*0.35, 2);
+
+                        $fzone_paytype= [
+//                ['type'=>'b1','price'=>$jcvr,'other'=>$jcjf],
+                            ['type'=>'b2','price'=>$jcprice,'other'=>$jcjf1],
+//                ['type'=>'b3','price'=>$jcvr1,'other'=>$jcjd],
+                            ['type'=>'b4','price'=>$jcprice1,'other'=>$jcjd1],
+//                ['type'=>'b5','price'=>$product['price'],'other'=>0],
+                            ['type'=>'b6','price'=>$product['price'],'other'=>0],
+                        ];
+
+                    }
+                }
             }
 
 

app/common/repositories/store/product/ThirdPartyCategoryRepository.php

@@ -122,6 +122,7 @@ class ThirdPartyCategoryRepository extends BaseRepository
         //查询商品是否有货
         $stock = GongApiRequest::stock($sku_id,$address_id,$num);
         if($stock != '有货'){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品无货']);
             if($delivery){
                 return false;
             }else{
@@ -132,6 +133,7 @@ class ThirdPartyCategoryRepository extends BaseRepository
         //查询商品上下架
         $goods_status = GongApiRequest::goods_status($spu_id);
         if(!isset($goods_status[0]['status']) || $goods_status[0]['status'] != 1){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品已下架']);
             if($delivery){
                 return false;
             }else{
@@ -142,6 +144,7 @@ class ThirdPartyCategoryRepository extends BaseRepository
         //查询库存
         $sku_stock = GongApiRequest::sku_stock(json_encode($sku),$address_id);
         if(!isset($sku_stock[0]['stock']) || $sku_stock[0]['stock'] != '有货'){
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品规格无货']);
             if($delivery){
                 return false;
             }else {

app/common/repositories/system/merchant/MerchantRepository.php

@@ -413,7 +413,7 @@ class MerchantRepository extends BaseRepository
      * @param $userInfo
      * @return mixed
      */
-    public function productList($merId, $where, $page, $limit, $userInfo,$type439=false)
+    public function productList($merId, $where, $page, $limit, $userInfo,$type439=false,$is_commercetrade = 0)
     {
         log::info("========j进入prodctList");
         log::info($merId);
@@ -467,7 +467,7 @@ class MerchantRepository extends BaseRepository
                     ]
                 ];
 
-            }else if($merId == 439){
+            }else if($merId == 439 || $is_commercetrade){
                 //精彩生活和商贸区
                 $jf = $v['price'] - round($v['concession_pri']*0.3, 2) . ' + ' . round($v['concession_pri']*0.3, 2);
                 $jd = $v['price'] - round($v['concession_pri']*0.35, 2) . ' + ' . round($v['concession_pri']*0.35, 2);

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -153,6 +153,9 @@ class UserOfflineRechargeRepository extends BaseRepository
                     ]);
                     $user->annuity += $order->pension;
                     $user->annuity_num += 1;
+                    if (!$user->mer_id || !$user->locktime) {
+                        Db::name('user')->where('uid', $unionUser->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
+                    }
                     $user->save();
 
                     //同步用户部分------------------------------------
@@ -184,6 +187,7 @@ class UserOfflineRechargeRepository extends BaseRepository
                     ];
                     $user = Db::name('user')->where('uid', $unionUser->uid)->find();
                     $userRepository->feidacang_fenyong($user, $order_data, 0);
+                    $userRepository->feidacang_fenyong_mer($user, $order_data, 0);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }

app/controller/api/cron/CommissionCron.php

@@ -1303,4 +1303,10 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
         $this->sendEMail(['389123492@qq.com', '420132441@qq.com'], '结算定时', "执行结束<br/>" . $mallStr . date('Y-m-d H:i:s'), '如果邮件客户端不支持HTML则显示此内容');
     }
 
+
+
+    public function cesexx(){
+        // $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        // $storeOrderRepository->douhuomall_delivery();
+    }
 }

app/controller/api/store/merchant/Merchant.php

@@ -92,12 +92,13 @@ class Merchant extends BaseController
 
     public function productTypeList()
     {
-        $params= $this->request->params(['type','mer_cate_id','pageNum','pageSize']);
+        $params= $this->request->params(['type','mer_cate_id','pageNum','pageSize','mer_id']);
         $name=$params['type'];
 
         $domain = $this->request->domain();
         $id=0;
         $type439=true;
+        $is_commercetrade = 0;
         if($name=='dingsheng'){
             $id=486;
         }else if($name=='jingpin'){
@@ -114,6 +115,11 @@ class Merchant extends BaseController
             }
         }else if($name=='fugou'){
             $id=491;
+        }// 商贸区
+        else if($name=='commercetrade'){
+            if (empty($params['mer_id'])) return app('json')->fail('店铺不存在');
+            $id=$this->merId = $params['mer_id'];
+            $is_commercetrade = 1;
         }
         [$page, $limit] = $this->getPage();
         if($params['pageNum']!=''){
@@ -132,7 +138,7 @@ class Merchant extends BaseController
             $where['cate_id'] = $params['mer_cate_id'];
         }
 
-        return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439));
+        return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439,$is_commercetrade));
     }
 
     /**

app/controller/api/store/order/StoreOrder.php

@@ -70,12 +70,13 @@ class StoreOrder extends BaseController
     {
         $cartId = (array)$this->request->param('cart_id', []);
         $addressId = (int)$this->request->param('address_id');
+        $is_commercetrade = (int)$this->request->param('is_commercetrade',0);
         $psType = $this->request->param('type',true);//是否需要地址 boolean
         $uid = $this->request->uid();
 
         if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
             return app('json')->fail('已失效或已下单');
-        $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType);
+        $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType,'','',$is_commercetrade);
         $orderInfo['product_type']=0;
         if($this->source=='yhc'){
             $product_type=Db::name('store_cart')->alias('c')->join('store_product p','c.product_id=p.product_id')->whereIn('cart_id',$cartId)->column('p.type');
@@ -203,10 +204,10 @@ class StoreOrder extends BaseController
 
         //log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
         // $price = $decScore = $decJingScore =  0;
-        //foreach ($cartIds as $k=>$item){
+        foreach ($cartIds as $k=>$item){
 
-        // $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
-        // if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
+        $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
+        if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
         // $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
         // $price += bcmul($money, $item['cart_num'], 2);
 
@@ -227,7 +228,7 @@ class StoreOrder extends BaseController
         //     }
         //     $decJingScore += $productDecJingdou;
         // }
-        //}
+        }
 
 
         // if (!$decScore && !$decJingScore) {
@@ -475,6 +476,7 @@ class StoreOrder extends BaseController
 
             }else if(!empty($array_fzone_paytype['type'] == 'b2')){
                 //精彩生活现金+积分
+                //商贸区：现金+积分
 
                 $vrpri = $userdatas['score'] -  $array_fzone_paytype['other'];
 

app/controller/api/store/product/StoreProduct.php

@@ -161,10 +161,13 @@ class StoreProduct extends BaseController
      */
     public function recommendList()
     {
+        $mer_id = (int)$this->request->param('mer_id',0);
         [$page, $limit] = $this->getPage();
         if($this->source=='yhc' && $this->merId){
             $merId=$this->merId;
-        }else{
+        } elseif($mer_id){
+            $merId=$mer_id;
+        } else{
             $merId=321;
         }
         return app('json')->success($this->repository->recommend($this->userInfo, $merId, $page, $limit, null, 'create_time', 5));

route/api.php

@@ -1259,6 +1259,7 @@ Route::group('api/', function () {
     Route::get('platform_income_detail_get', 'api.cron.CommissionCron/platform_income_detail_get');//插入平台收支明细
     Route::get('clear_platform_income_detail', 'api.cron.CommissionCron/clear_platform_income_detail');//删除平台收支明细
     Route::get('take', 'api.cron.CommissionCron/take');//插入平台收支明细
+    Route::get('cesexx', 'api.cron.CommissionCron/cesexx');
     Route::get('order/group_detail/:id', 'api.store.order.StoreOrder/group_detail');//订单详情
     Route::get('commission_cron_bonus', 'api.cron.CommissionCron/bonus');