Skip to content

G
goods
Commit f9243919 authored by jianghaiming's avatar jianghaiming
Browse files
Options

Merge branch 'online_time'

parents 5d3bf93c 29521b6b
Show whitespace changes
Inline Side-by-side
Showing with 335 additions and 8 deletions
application/exception/custom/GoodsException.php
View file @ f9243919
...@@ -70,5 +70,6 @@ class GoodsException extends BaseException ...@@ -70,5 +70,6 @@ class GoodsException extends BaseException
49 => '库存不得小于已售库存', 49 => '库存不得小于已售库存',
self::RULE_LIMIT_ERROR => '单人可买上限填写错误', self::RULE_LIMIT_ERROR => '单人可买上限填写错误',
self::NOT_FIND_MARKETING => '找不到活动', self::NOT_FIND_MARKETING => '找不到活动',
52 => '过期时间不得小于等于上架开始时间',
]; ];
} }
\ No newline at end of file
application/library/Validate/GoodsOnlineSiteValidate.php 0 → 100644
View file @ f9243919
<?php
namespace Validate;
/**
* Class GoodsAuditValidate
*
* @package Validate
*/
class GoodsOnlineSiteValidate extends BaseValidate
{
protected $rule = [
'goods_spu_id' => 'require',
'online_type' => 'require',
];
protected $message = [
"goods_spu_id" => "商品id不能为空",
"online_type" => "设置类型不能为空",
];
}
\ No newline at end of file
application/modules/Goods/controllers/Goods.php
View file @ f9243919
...@@ -16,6 +16,7 @@ use \Validate\GoodsOnlineOfflineValidate; ...@@ -16,6 +16,7 @@ use \Validate\GoodsOnlineOfflineValidate;
use \Validate\PaySuccessGoodsCallbackValidate; use \Validate\PaySuccessGoodsCallbackValidate;
use \Validate\GoodsInitShopValidate; use \Validate\GoodsInitShopValidate;
use \Validate\PindanGoodsAddValidate; use \Validate\PindanGoodsAddValidate;
use \Validate\GoodsOnlineSiteValidate;
use \App\Services\goods\ElasticGoodService; use \App\Services\goods\ElasticGoodService;
use \App\Services\goods\MarketingPindanGoodsService; use \App\Services\goods\MarketingPindanGoodsService;
use \App\Models\marketing\mysql\Marketing; use \App\Models\marketing\mysql\Marketing;
...@@ -118,6 +119,20 @@ class GoodsController extends Base ...@@ -118,6 +119,20 @@ class GoodsController extends Base
$this->success(); $this->success();
} }
/**
* 修改商品定点上架设置
* @date 2021-08-25
* @license [license]
* @version [version]
*/
public function online_siteAction()
{
$params = $this->params;
(new GoodsOnlineSiteValidate())->validate();
GoodsService::onlineSite($params);
$this->success();
}
/** /**
* 审核通过/驳回 * 审核通过/驳回
*/ */
......
application/services/goods/GoodsService.php
View file @ f9243919
...@@ -255,11 +255,41 @@ class GoodsService ...@@ -255,11 +255,41 @@ class GoodsService
"inventory_rest" => $skuData["inventory"], "inventory_rest" => $skuData["inventory"],
"original_price" => empty($skuData["original_price"]) ? '' : $skuData["original_price"] * 100, "original_price" => empty($skuData["original_price"]) ? '' : $skuData["original_price"] * 100,
"price" => $skuData["price"] * 100, "price" => $skuData["price"] * 100,
"online_start_time" => empty($skuData["online_start_time"]) ? "" : $skuData["online_start_time"],
"online_end_time" => empty($skuData["online_end_time"]) ? "" : $skuData["online_end_time"],
"online_type" => empty($skuData["online_type"]) ? "" : $skuData["online_type"],
]; ];
if (!empty($skuData["setmeal"])) { if (!empty($skuData["setmeal"])) {
$skuParams["setmeal"] = $skuData["setmeal"]; $skuParams["setmeal"] = $skuData["setmeal"];
} }
$online_type = empty($skuData["online_type"]) ? 0 : $skuData["online_type"];
switch ($online_type) {
case 1:
$skuParams['online_status'] = 0;
$skuParams['online_start_time'] = date("Y-m-d H:i:s");
break;
case 2:
$skuParams['online_status'] = 0;
break;
case 3:
$skuParams['online_status'] = 0;
break;
default:
# code...
break;
}
if (!empty($skuData["online_type"])) {
//立即上架和定时上架
if (in_array($skuData["online_type"], [1,2])) {
if ($skuData["expiration_time"] <= $skuData['online_start_time']) {
throw new GoodsException(["cus" => 52]);
}
}
}
GoodsSku::save($skuParams); GoodsSku::save($skuParams);
self::addGoodsSkuPicRecord($skuId, $skuData); self::addGoodsSkuPicRecord($skuId, $skuData);
return $skuId; return $skuId;
...@@ -408,6 +438,27 @@ class GoodsService ...@@ -408,6 +438,27 @@ class GoodsService
]; ];
} }
if ($status == GoodsSku::STATUS_PASS) {
$online_type = empty($sku["online_type"]) ? 0 : $sku["online_type"];
if ($online_type == 1) {
$statusData['online_status'] = GoodsSku::ONLINE_STATUS_ONLINE;
$statusData['online_start_time'] = date("Y-m-d H:i:s");
}
//定点上架
if ($online_type == 2) {
$onlineStartTime = empty($sku["online_start_time"]) ? 0 : strtotime($sku["online_start_time"]);
if ($onlineStartTime > time()) {
$statusData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}
}
//暂不上架
if ($online_type == 3) {
$statusData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}
}
GoodsSku::save($statusData, ["goods_sku_id" => $sku["goods_sku_id"]]); GoodsSku::save($statusData, ["goods_sku_id" => $sku["goods_sku_id"]]);
//商品操作记录 //商品操作记录
...@@ -480,8 +531,22 @@ class GoodsService ...@@ -480,8 +531,22 @@ class GoodsService
if ($onlineStatus == GoodsSku::ONLINE_STATUS_ONLINE && $sku["inventory_rest"] <= 0) { if ($onlineStatus == GoodsSku::ONLINE_STATUS_ONLINE && $sku["inventory_rest"] <= 0) {
throw new GoodsException(["cus" => 24]); throw new GoodsException(["cus" => 24]);
} }
$goodsSkuData = ["online_status" => $onlineStatus];
if ($onlineStatus == GoodsSku::ONLINE_STATUS_OFFLINE){
$goodsSkuData['online_type'] = 3;
$goodsSkuData['online_start_time'] = null;
$goodsSkuData['online_end_time'] = null;
}
if ($onlineStatus == GoodsSku::ONLINE_STATUS_ONLINE){
$goodsSkuData['online_type'] = 1;
$goodsSkuData['online_start_time'] = date("Y-m-d H:i:s");
}
$goodsSkuId = $sku["goods_sku_id"]; $goodsSkuId = $sku["goods_sku_id"];
GoodsSku::save(["online_status" => $onlineStatus], ["goods_sku_id" => $goodsSkuId]); GoodsSku::save($goodsSkuData, ["goods_sku_id" => $goodsSkuId]);
//商品操作记录 //商品操作记录
$record = [ $record = [
...@@ -512,6 +577,103 @@ class GoodsService ...@@ -512,6 +577,103 @@ class GoodsService
return true; return true;
} }
/**
* 设置商品上架
* @date 2021-08-25
* @copyright [copyright]
* @license [license]
* @version [version]
* @param $params [description]
* @return array [description]
*/
public static function onlineSite($params)
{
$goodsSpuId = $params["goods_spu_id"];
$onlineType = !empty($params["online_type"]) ? $params["online_type"] : 0;
$onlineStartTime = !empty($params["online_start_time"]) ? $params["online_start_time"] : null;
$onlineEndTime = !empty($params["online_end_time"]) ? $params["online_end_time"] : null;
GoodsSku::beginTransaction();
$goodsSkuList = GoodsSku::select("*", ["goods_spu_id" => $goodsSpuId]);
if (!empty($goodsSkuList)) {
foreach ($goodsSkuList as $sku) {
if ($sku["expiration_time"] < date("Y-m-d H:i:s")) {
throw new GoodsException(["cus" => 30]);
}
$goodsSkuId = $sku["goods_sku_id"];
$goodsSkuData = [
"online_type" => $onlineType,
"online_start_time" => $onlineStartTime,
"online_end_time" => $onlineEndTime
];
if ($onlineType == 1) {
if ($sku['audit_status'] == 1) {
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_ONLINE;
}
$goodsSkuData['online_start_time'] = date("Y-m-d H:i:s");
}
//暂不上架
if ($onlineType == 3) {
//$goodsSkuData['audit_status'] = 0;
if ($sku['audit_status'] == 1) {
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}else{
$goodsSkuData['online_status'] = 0;
}
}
if ($onlineType == 2) {
$onlineStartTime = strtotime($goodsSkuData['online_start_time']);
if ($onlineStartTime > time()) {
if ($sku['audit_status'] == 1) {
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}else{
$goodsSkuData['online_status'] = 0;
}
}
}
//立即上架和定时上架
if (in_array($onlineType, [1,2])) {
if ($sku["expiration_time"] <= $goodsSkuData['online_start_time']) {
throw new GoodsException(["cus" => 52]);
}
}
$operatorId = empty($params["user_id"]) ? 0 : $params["user_id"];
$operatorName = !empty($params["user_name"]) ? $params["user_name"] : '';
//商品操作记录
$record = [
"goods_spu_id" => $goodsSpuId,
"goods_sku_id" => $goodsSkuId,
"operator_id" => $operatorId,
"operator_name" => $operatorName,
"goods_status" => $sku["audit_status"],
"online_status" => !empty($goodsSkuData['online_status']) ? $goodsSkuData['online_status'] : $sku["online_status"],
"before_version" => $sku["goods_version"],
"after_version" => $sku["goods_version"],
"note" => empty($params["rejected_reason"]) ? "" : $params["rejected_reason"],
];
GoodsOperationRecord::insertRecord($record);
GoodsSku::save($goodsSkuData, ["goods_sku_id" => $goodsSkuId]);
//上架的话，生成快照
self::addGoodsSnapshot($sku);
self::updateGoodsInfoToEs($goodsSkuId);
}
}
if (!GoodsSku::commit()) {
GoodsSku::rollback();
throw new GoodsException(["cus" => 11]);
}
return true;
}
/** /**
* 生成快照数据 * 生成快照数据
* @param $skuInfo * @param $skuInfo
...@@ -715,6 +877,28 @@ class GoodsService ...@@ -715,6 +877,28 @@ class GoodsService
$skuParams["setmeal"] = $params["setmeal"]; $skuParams["setmeal"] = $params["setmeal"];
} }
if (!empty($params["online_start_time"])) {
$skuParams['online_start_time'] = empty($params["online_start_time"]) ? "" : $params["online_start_time"];
}
if (!empty($params["online_end_time"])) {
$skuParams['online_end_time'] = empty($params["online_end_time"]) ? "" : $params["online_end_time"];
}
if (!empty($params["online_type"])) {
$skuParams['online_type'] = empty($params["online_type"]) ? 0 : $params["online_type"];
}
if (!empty($params["online_type"])) {
//立即上架和定时上架
if (in_array($params["online_type"], [1,2])) {
if ($skuData["expiration_time"] <= $skuParams['online_start_time']) {
throw new GoodsException(["cus" => 52]);
}
}
}
//商品操作记录 //商品操作记录
$record = [ $record = [
"goods_spu_id" => $skuData["goods_spu_id"], "goods_spu_id" => $skuData["goods_spu_id"],
...@@ -882,6 +1066,9 @@ class GoodsService ...@@ -882,6 +1066,9 @@ class GoodsService
$data["goods_info"]["clear_price"] = empty($sku["clear_price"]) ? "" : $sku["clear_price"] / 100; $data["goods_info"]["clear_price"] = empty($sku["clear_price"]) ? "" : $sku["clear_price"] / 100;
$data["goods_info"]["price"] = $sku["price"] / 100; $data["goods_info"]["price"] = $sku["price"] / 100;
$data["goods_info"]["inventory"] = $sku["inventory_rest"]; $data["goods_info"]["inventory"] = $sku["inventory_rest"];
$data["goods_info"]["online_type"] = $sku["online_type"];
$data["goods_info"]["online_start_time"] = $sku["online_start_time"];
$data["goods_info"]["online_end_time"] = $sku["online_end_time"];
$categoryNameList = Category::select("name", ["category_id" => [$sku["category_1_id"], $sku["category_2_id"]]]); $categoryNameList = Category::select("name", ["category_id" => [$sku["category_1_id"], $sku["category_2_id"]]]);
$data["goods_info"]["category_1_name"] = $categoryNameList[0]; $data["goods_info"]["category_1_name"] = $categoryNameList[0];
...@@ -1025,14 +1212,31 @@ class GoodsService ...@@ -1025,14 +1212,31 @@ class GoodsService
//是否是分销活动 //是否是分销活动
$runningMarketing = MarketingGoodsService::getRunningMarketing([$params["goods_sku_id"]]); $runningMarketing = MarketingGoodsService::getRunningMarketing([$params["goods_sku_id"]]);
$data["goods_info"]["is_fenxiao"] = false; $data["goods_info"]["is_fenxiao"] = false;
if (!empty($runningMarketing[$params["goods_sku_id"]])) { if (!empty($runningMarketing[$params["goods_sku_id"]])) {
$data["goods_info"]["is_fenxiao"] = true; $data["goods_info"]["is_fenxiao"] = true;
} }
$marketingInfoList = MarketingGoods::select(["marketing_id", "goods_sku_id"], ["goods_sku_id" => $params["goods_sku_id"]]);
$data["goods_info"]['goods_share_code'] = CommonService::getGoodsShareId($params); if (!empty($marketingInfoList)) {
foreach ($marketingInfoList as $marketingInfo) {
$marketingInfoIds[$marketingInfo["goods_sku_id"]] = $marketingInfo["marketing_id"];
}
$marketingIds = array_values($marketingInfoIds);
$now = date("Y-m-d H:i:s");
$resMarketingList = Marketing::select("*", ["start_time[<]" => $now, "end_time[>]" => $now, "marketing_id" => $marketingIds, "marketing_type" => Marketing::MARKETING_TYPE_FENXIAO]);
if (!empty($resMarketingList)) {
foreach ($resMarketingList as $res) {
$marketingList[$res["marketing_id"]] = $res;
}
}
}
$marketing = !empty($marketingList) ? current($marketingList) : [];
$data["goods_info"]['goods_share_code'] = CommonService::getGoodsShareId($params);
//当前人是否是团长 //当前人是否是团长
$data["goods_info"]["is_tuanzhang"] = false; $data["goods_info"]["is_tuanzhang"] = false;
if (!empty($params["user_id"])) { if (!empty($params["user_id"])) {
...@@ -1041,7 +1245,11 @@ class GoodsService ...@@ -1041,7 +1245,11 @@ class GoodsService
$data["goods_info"]["is_tuanzhang"] = true; $data["goods_info"]["is_tuanzhang"] = true;
if (!empty($runningMarketing)) { if (!empty($runningMarketing)) {
//分销返现多少钱 //分销返现多少钱
$data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]] * $data["goods_info"]["price"]); if (!empty($marketing) && $marketing['commission_mode'] == 2) {
$data["goods_info"]["cash_back"] = (float)sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]]);
}else{
$data["goods_info"]["cash_back"] = (float)sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]] * $data["goods_info"]["price"]);
}
} }
} }
} }
...@@ -1092,13 +1300,23 @@ class GoodsService ...@@ -1092,13 +1300,23 @@ class GoodsService
$where['ORDER'] = ["create_time" => "DESC"]; $where['ORDER'] = ["create_time" => "DESC"];
$list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "category_1_id", "category_2_id", "life_account_id", $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "category_1_id", "category_2_id", "life_account_id",
"publish_user_id", "update_time", "create_time", "audit_status", "online_status"], "publish_user_id", "update_time", "create_time", "audit_status", "online_status","online_start_time","online_end_time","online_type"],
$where); $where);
if (!empty($list)) { if (!empty($list)) {
foreach ($list as $key => $item) { foreach ($list as $key => $item) {
$nameList = Category::select("name", ["category_id" => [$item["category_1_id"], $item["category_2_id"]]]); $nameList = Category::select("name", ["category_id" => [$item["category_1_id"], $item["category_2_id"]]]);
$list[$key]["category_1_name"] = $nameList[0]; $list[$key]["category_1_name"] = $nameList[0];
$list[$key]["category_2_name"] = $nameList[1]; $list[$key]["category_2_name"] = $nameList[1];
if ($item['online_type'] == 3) {
$list[$key]["online_start_time"] = "";
$list[$key]["online_end_time"] = "";
}
if ($item['online_type'] == 1) {
$list[$key]["online_end_time"] = "";
}
} }
} }
return ["list" => $list, "count" => $count]; return ["list" => $list, "count" => $count];
......
application/services/marketing/MarketingGoodsService.php
View file @ f9243919
...@@ -150,12 +150,12 @@ class MarketingGoodsService ...@@ -150,12 +150,12 @@ class MarketingGoodsService
//比例 //比例
if (!empty($secondCommission) && $commissionMode == 1) { if (!empty($secondCommission) && $commissionMode == 1) {
$price = !empty($list[$i]['price']) ? $list[$i]['price'] : 0; $price = !empty($list[$i]['price']) ? $list[$i]['price'] : 0;
$list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission*$price/100),0,-2); $list[$i]['share_price'] = (float) substr(sprintf("%.4f",$secondCommission*$price/100),0,-2);
} }
//固定 //固定
if (!empty($commissionMode) && $commissionMode == 2) { if (!empty($commissionMode) && $commissionMode == 2) {
$list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission/100),0,-2); $list[$i]['share_price'] = (float) substr(sprintf("%.4f",$secondCommission),0,-2);
} }
$content = $userId .'_' .$value['marketing_id']; $content = $userId .'_' .$value['marketing_id'];
...@@ -195,9 +195,13 @@ class MarketingGoodsService ...@@ -195,9 +195,13 @@ class MarketingGoodsService
$data = []; $data = [];
foreach ($marketingInfoIds as $goodsSkuId => $marketingId) { foreach ($marketingInfoIds as $goodsSkuId => $marketingId) {
if (!empty($marketingList[$marketingId]["second_commission_value"])) { if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["commission_mode"] == 1) {
$data[$goodsSkuId] = substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/10000), 0, -2); $data[$goodsSkuId] = substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/10000), 0, -2);
} }
if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["commission_mode"] == 2) {
$data[$goodsSkuId] = substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/100), 0, -2);
}
} }
return $data; return $data;
} }
......
application/services/marketing/MarketingService.php
View file @ f9243919
...@@ -493,6 +493,9 @@ class MarketingService ...@@ -493,6 +493,9 @@ class MarketingService
$clearPrice = !empty($value["clear_price"]) ? $value["clear_price"] : 0; $clearPrice = !empty($value["clear_price"]) ? $value["clear_price"] : 0;
$price = !empty($value["price"]) ? $value["price"] : 0; $price = !empty($value["price"]) ? $value["price"] : 0;
$chargeFee = !empty($price) ? (float)bcmul($price , self::CHARGEFEE,2) : 0; //手续费 (分) $chargeFee = !empty($price) ? (float)bcmul($price , self::CHARGEFEE,2) : 0; //手续费 (分)
if ($chargeFee < 1) {
$chargeFee = 0;
}
if (!empty($clearPrice) && $clearPrice > 0) { if (!empty($clearPrice) && $clearPrice > 0) {
if ($commissionMode == Marketing::COMMISSION_MODE_RATE) { if ($commissionMode == Marketing::COMMISSION_MODE_RATE) {
$commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price; $commissionTotal = ($firstCommissionRate + $secondCommissionRate) / 10000 * $price;
......
daemon/Goods.php
View file @ f9243919
...@@ -29,8 +29,10 @@ class Goods implements DaemonServiceInterface ...@@ -29,8 +29,10 @@ class Goods implements DaemonServiceInterface
GoodsSku::save($colums, $where); GoodsSku::save($colums, $where);
//更新es //更新es
GoodsService::updateGoodsInfoToEs($where['goods_sku_id']); GoodsService::updateGoodsInfoToEs($where['goods_sku_id']);
} }
$this->onlineGoods();
$this->onlineOffGoods();
} }
...@@ -53,4 +55,65 @@ class Goods implements DaemonServiceInterface ...@@ -53,4 +55,65 @@ class Goods implements DaemonServiceInterface
GoodsService::updateGoodsInfoToEs($where['goods_sku_id']); GoodsService::updateGoodsInfoToEs($where['goods_sku_id']);
} }
} }
/**
*
* 自动上线
*/
public function onlineGoods()
{
sleep(2);
$orderData = [
'online_type' => 2,
'online_status' => [0,2],
'audit_status' => 1,
'online_start_time[<]' => date("Y-m-d H:i:s",time()),
'online_end_time[>]' => date("Y-m-d H:i:s",time()),
'LIMIT' => 100,
];
$goodsList = GoodsSku::getRecords($orderData);
DaemonLog::info('DaemonServiceOnline_goods', json_encode($goodsList));
foreach ($goodsList as $key => $value) {
$where = [];
$where['goods_sku_id'] = !empty($value['goods_sku_id']) ? $value['goods_sku_id'] : '';
$colums = [
'online_status' => 1,
];
GoodsSku::save($colums, $where);
//更新es
GoodsService::updateGoodsInfoToEs($where['goods_sku_id']);
}
}
/**
*
* 自动下架
*/
public function onlineOffGoods()
{
sleep(2);
$orderData = [
'online_type' => 2,
'online_status' => 1,
'audit_status' => 1,
'online_end_time[<]' => date("Y-m-d H:i:s",time()),
'LIMIT' => 100,
];
$goodsList = GoodsSku::getRecords($orderData);
DaemonLog::info('DaemonServiceOnlineOff_goods', json_encode($goodsList));
foreach ($goodsList as $key => $value) {
$where = [];
$where['goods_sku_id'] = !empty($value['goods_sku_id']) ? $value['goods_sku_id'] : '';
$colums = [
'online_status' => 2,
];
GoodsSku::save($colums, $where);
//更新es
GoodsService::updateGoodsInfoToEs($where['goods_sku_id']);
}
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment