Merge branch 'master' into dev

app/command/WiwibaoProductSync.php

@@ -431,7 +431,7 @@ class WiwibaoProductSync extends Command
      */
     protected function calculateCostPrice($platPrice)
     {
-        return bcadd((string)$platPrice, bcmul((string)$platPrice, '0.23', 4), 2);
+        return bcadd((string)$platPrice, bcmul((string)$platPrice, '0.73', 4), 2);
     }
 
     /**

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

@@ -2631,6 +2631,9 @@ class StoreOrderRepository extends BaseRepository
                     'specId' => $cart['productAttr']['spec_id'],
                     'quantity' => $cart['cart_num']
                 ];
+                if (!$cart['product']['spu_id'] || !$cart['productAttr']['spec_id']) {
+                    throw new ValidateException('1688预下单接口请求失败');
+                }
                 $orderService = new OrderService();
                 $ailOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
                 if ($ailOrder['preview']['sumCarriage'] > 0) {
@@ -5212,7 +5215,7 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('service_id,nickname');
                 }, 'user' => function ($query) {
                     return $query->field('uid,phone,nickname');
-                }, 'userPvLog', 'sharedProsperityRewardRecord'
+                }, 'userPvLog', 'sharedProsperityRewardRecord','groupOrder'
             ]);
         $query1 = clone ($query);
         $query2 = clone ($query);
@@ -11692,7 +11695,8 @@ class StoreOrderRepository extends BaseRepository
 
             // 为消费者 初始化 添加养老金记录
             if (is_null($yanglaojin)) {
-                $yanglaojin = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                $goodPrice = bcsub($storeOrderEntity->getTotalPrice(),$storeOrderEntity->getTotalPostage(),CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                $yanglaojin = bcmul($goodPrice, CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
             }
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
@@ -12105,17 +12109,21 @@ class StoreOrderRepository extends BaseRepository
             }
         }
 
-        $withdrawalLimit = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::WITHDRAWAL_LIMIT_RATIO, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-        /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
-        $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
-        $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
-            $userEntity->getUid(),
-            UserWithdrawalLimitRecordEnum::PM['INCOME']['code'],
-            $withdrawalLimit,
-            UserWithdrawalLimitRecordEnum::TYPE_SHOP['Platform']['code'],
-            $storeOrderEntity->getOrderSn(),
-            '消费获得提现额度'
-        );
+
+        // 复购区不给提现额度
+        if ($storeOrderEntity->getMerId() != CommonEnum::DESIGN_MERCHANT_ID['Repurchase']['code']) {
+            $withdrawalLimit = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::WITHDRAWAL_LIMIT_RATIO, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
+            $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
+            $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
+                $userEntity->getUid(),
+                UserWithdrawalLimitRecordEnum::PM['INCOME']['code'],
+                $withdrawalLimit,
+                UserWithdrawalLimitRecordEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderSn(),
+                '消费获得提现额度'
+            );
+        }
     }
 
     /**

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

@@ -137,7 +137,7 @@ class ProductAttrValueRepository extends BaseRepository
         //查询商品上下架
         $goods_status = GongApiRequest::goods_status($spu_id);
         if(!isset($goods_status['status']) || $goods_status['status'] != 1){
-            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品已下架'.json_encode($goods_status)]);
+            Db::name('store_product')->where('product_id',$product_id)->update(['is_show' => 0, 'argument' => '此商品已下架111'.json_encode($goods_status)]);
             if($delivery){
                 return false;
             }else{

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

@@ -503,6 +503,8 @@ class ProductRepository extends BaseRepository
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
+                        'sku_id' => $value['sku_id'] ?? null,
+                        'spec_id' => $value['spec_id'] ?? null,
                     ];
                 }
                 if (!$pric) $pric = $value['price'];
@@ -998,7 +1000,7 @@ class ProductRepository extends BaseRepository
      */
     public function detail($id, $userInfo)
     {
-        $field = 'product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,ficti,video_link,product_type,type,dc_price,seckill,spu_id';
+        $field = 'product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,ficti,video_link,product_type,type,dc_price,seckill,spu_id,pension_is,pension';
         $with = [
             'attr', 'attrValue', 'content', 'topReply.orderProduct' => function ($query) {
                 $query->field('reply_id,uid,nickname,merchant_reply_content,avatar,order_product_id,product_id,product_score,service_score,postage_score,comment,pics,create_time');
@@ -1097,6 +1099,11 @@ class ProductRepository extends BaseRepository
 
         }
 
+        // 显示单独设置的养老金
+        if ($res['pension_is'] != 0) {
+            $res['yanglao'] = $res['pension'];
+        }
+
         $res['pv']=($k['pv']);
         $res['jifen']=($k['jifen']);
         $res['gongxian']=($k['gongxian']);
@@ -1893,6 +1900,10 @@ class ProductRepository extends BaseRepository
                     }
                 }
             }
+
+            if ($product['pension_is'] != 0) {
+                $yanglao = $product['pension'];
+            }
         }else{//线下商品
 
             if ($mer_id>0){

app/controller/api/shareProsperity/Task.php

@@ -474,15 +474,15 @@ class Task
         // 李玉芝 238元，
         // 其他5人，每人68元
         $userData = [
-            192 => 1280,
+            192 => 1680,
             62 => 380,
-            43 => 158,
-            2393 => 238,
-            3 => 58,
-            4001 => 58,
-            4073 => 58,
-            2540 => 58,
-            4899 => 58,
+            43 => 28.57,
+            2393 => 28.57,
+            3 => 28.57,
+            4001 => 28.57,
+            4073 => 28.57,
+            2540 => 28.57,
+            4899 => 28.57,
         ];
 
         foreach ($userData as $uid => $money) {
@@ -579,10 +579,10 @@ class Task
         ];
         $money = [
             1 => 1.86,
-            2 => 3.73,
+            2 => 3.64,
             3 => 9.52,
             4 => 17.5,
-            5 => 22.22,
+            5 => 28.57,
         ];
         $groupUser = Db::name('shared_prosperity_user')->where('partner_level', $level)->select()->toArray();
         $userData = array_column($groupUser, 'user_id');

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

@@ -557,7 +557,8 @@ class Jd extends BaseController
                 } while ($page <= $maxPage);
                 Db::commit();
             } catch (DbException $e) {
-                Db::startTrans();
+                Db::rollback();
+                Log::info("JD API error : " . $e->getMessage());
             }
         }
 
@@ -576,7 +577,7 @@ class Jd extends BaseController
         ];
         $result = $this->getUrlResult($apiName, $params);
         $result = json_decode($result, true);
-
+        Log::info("JD API result (eliteId:{$eliteId}, page:{$page}): " . json_encode($result));
         $result = json_decode($result['jd_union_open_goods_jingfen_query_responce']['queryResult'], true);
         //        $result = $result['data'] ?? [];
         return $result;

app/services/ThirdParty/AlibabaAgent/ProductService.php

@@ -369,14 +369,14 @@ class ProductService extends AlibabaAgentBaseService
     // ================================================================
 
     /**
-     * 对价格进行加价处理（加价50%）
+     * 对价格进行加价处理（加价20%）
      *
      * @param float $price 原价
      * @return float 加价后的价格
      */
     protected function applyMarkup(float $price): float
     {
-        return round($price * 1.5, 2);
+        return round($price * 1.2, 2);
     }
 
     // ================================================================