diff --git a/app/common/repositories/user/UserAssetsLogRepository.php b/app/common/repositories/user/UserAssetsLogRepository.php
index 322e342..7a4800a 100644
--- a/app/common/repositories/user/UserAssetsLogRepository.php
+++ b/app/common/repositories/user/UserAssetsLogRepository.php
@@ -356,7 +356,7 @@ class UserAssetsLogRepository extends BaseRepository
continue;
}
- $item = $hotRepository->getWhere(['product_id' => $productItem['product_id'], 'uid' => $order['uid']]);
+ $item = $hotRepository->getWhere(['uid' => $order['uid']]);
if ($item) {
$item['total'] += $product['hot_integral_total'] * $productItem['product_num'];
$item->save();
@@ -374,7 +374,7 @@ class UserAssetsLogRepository extends BaseRepository
// 计算每个购买当前爆单商品的积分数据
$profit = $productItem['total_price'] - $productItem['cost'] * $productItem['product_num'];
$where = array();
- $where[] = array('product_id', '=', $productItem['product_id']);
+// $where[] = array('product_id', '=', $productItem['product_id']);
$list = $hotRepository->getList($where);
$logList = array();
@@ -382,7 +382,7 @@ class UserAssetsLogRepository extends BaseRepository
$tmp = $this->_getIntegral($profit * $product['hot_integral_rate'] / 100 / count($list));
if ($item['total'] - $item['current'] < $tmp['integral_buy'] + $tmp['integral_withdraw']) {
$tmp = $this->_getIntegral($item['total'] - $item['current']);
- $item['status'] = 1;
+// $item['status'] = 1;
}
$this->userAssetsRepository->updateAssets($item['uid'], $tmp);
$item['current'] += $tmp['integral_buy'] + $tmp['integral_withdraw'];
diff --git a/app/controller/admin/system/Lottery.php b/app/controller/admin/system/Lottery.php
index 18004dc..e74deb5 100644
--- a/app/controller/admin/system/Lottery.php
+++ b/app/controller/admin/system/Lottery.php
@@ -62,7 +62,7 @@ class Lottery extends BaseController
{
$data = Request::post();
- if(count($data) != 8){
+ if(count($data) != 6){
return app('json')->fail('参数错误');
}
diff --git a/public/system.html b/public/system.html
index f274e0b..091c0bf 100755
--- a/public/system.html
+++ b/public/system.html
@@ -1,3 +1,3 @@
-加载中...
\ No newline at end of file
diff --git a/view/admin/src/views/user/prize/index.vue b/view/admin/src/views/user/prize/index.vue
index 027f36b..5647e97 100644
--- a/view/admin/src/views/user/prize/index.vue
+++ b/view/admin/src/views/user/prize/index.vue
@@ -30,14 +30,14 @@ export default{
data(){
return{
list:[
-
+
],
numList:["一","二","三","四","五","六"]
}
},
methods:{
typeChange(val,item){
-
+
if(val!=1){
item.value=0;
}
@@ -49,11 +49,14 @@ export default{
})
},
submitHandle(){
-
+
setLotteryData(this.list).then(res=>{
this.getLotteryData()
this.$message({type:'success',message:'保存成功'});
})
+ .catch(res => {
+ this.$message.error(res.message);
+ })
}
},
mounted(){
@@ -63,7 +66,7 @@ export default{
\ No newline at end of file
+