1

app/admin/controller/ump/StoreCombination.php

@@ -329,6 +329,7 @@ class StoreCombination extends AuthController
                 $productAttr[0]['volume'] = 0;
                 $productAttr[0]['brokerage'] = 0;
                 $productAttr[0]['return'] = 0;
+                $productAttr[0]['integral'] = 0;
                 $productAttr[0]['brokerage_two'] = 0;
                 $productAttr[0]['check'] = 0;
             }
@@ -398,6 +399,7 @@ class StoreCombination extends AuthController
                     if ($v['detail'] == $vv['detail']) {
                         $attrFormat[$k]['price'] = $vv['price'];
                         $attrFormat[$k]['return'] = $vv['return'];
+                        $attrFormat[$k]['integral'] = $vv['integral'];
                         $attrFormat[$k]['sales'] = $vv['sales'];
                         $attrFormat[$k]['pic'] = $vv['pic'];
                         $attrFormat[$k]['check'] = false;
@@ -405,6 +407,7 @@ class StoreCombination extends AuthController
                     } else {
                         $attrFormat[$k]['price'] = '';
                         $attrFormat[$k]['return'] = '';
+                        $attrFormat[$k]['integral'] = '';
                         $attrFormat[$k]['sales'] = '';
                         $attrFormat[$k]['pic'] = $product['image'];
                         $attrFormat[$k]['check'] = true;
@@ -415,6 +418,7 @@ class StoreCombination extends AuthController
             foreach ($attrFormat as $k => $v) {
                 $attrFormat[$k]['price'] = $product['price'];
                 $attrFormat[$k]['return'] = $product['return'] ?? 0;
+                $attrFormat[$k]['integral'] = $product['integral'] ?? 0;
                 $attrFormat[$k]['sales'] = $product['stock'];
                 $attrFormat[$k]['pic'] = $product['image'];
                 $attrFormat[$k]['check'] = false;
@@ -553,7 +557,7 @@ class StoreCombination extends AuthController
             $detail = $item['detail'];
 //            sort($item['detail'], SORT_STRING);
             $suk = implode(',', $item['detail']);
-            $sukValue = StoreProductAttrValue::where('product_id', $id)->where('type', $type)->where('suk', $suk)->column('bar_code,cost,price,ot_price,stock,image as pic,weight,volume,brokerage,brokerage_two,quota,return', 'suk');
+            $sukValue = StoreProductAttrValue::where('product_id', $id)->where('type', $type)->where('suk', $suk)->column('bar_code,cost,price,ot_price,stock,image as pic,weight,volume,brokerage,brokerage_two,quota,return,integral', 'suk');
             if (count($sukValue)) {
                 foreach (array_values($detail) as $k => $v) {
                     $valueNew[$count]['value' . ($k + 1)] = $v;
@@ -562,6 +566,7 @@ class StoreCombination extends AuthController
                 $valueNew[$count]['pic'] = $sukValue[$suk]['pic'] ?? '';
                 $valueNew[$count]['price'] = $sukValue[$suk]['price'] ? floatval($sukValue[$suk]['price']) : 0;
                 $valueNew[$count]['return'] = $sukValue[$suk]['return'] ? floatval($sukValue[$suk]['return']) : 0;
+                $valueNew[$count]['integral'] = $sukValue[$suk]['integral'] ? floatval($sukValue[$suk]['integral']) : 0;
                 $valueNew[$count]['cost'] = $sukValue[$suk]['cost'] ? floatval($sukValue[$suk]['cost']) : 0;
                 $valueNew[$count]['ot_price'] = isset($sukValue[$suk]['ot_price']) ? floatval($sukValue[$suk]['ot_price']) : 0;
                 $valueNew[$count]['stock'] = $sukValue[$suk]['stock'] ? intval($sukValue[$suk]['stock']) : 0;

app/admin/model/store/StoreProductAttr.php

@@ -102,6 +102,7 @@ class StoreProductAttr extends BaseModel
                 'type' => $type,
                 'quota' => $value['quota'] ?? 0,
                 'return' => $value['return'] ?? 0,
+                'integral' => $value['integral'] ?? 0,
                 'quota_show' => $value['quota'] ?? 0,
             ];
         }

app/admin/view/ump/store_combination/attr_list.php

@@ -31,6 +31,7 @@
                     <th>图片</th>
                     <th>售价</th>
                     <th>未拼中返佣</th>
+                    <th>拼中送积分</th>
                     <th>成本价</th>
                     <th>原价</th>
                     <th>库存</th>
@@ -52,7 +53,7 @@
                     {elseif condition="$key eq 'check'"/}
                     <td><input type="checkbox" name="ids[]" value="{$k}" {if condition="$item eq 1"}checked{/if}></td>
                     {elseif condition="($key neq 'brokerage') AND ($key neq 'brokerage_two')"/}
-                    {if condition="($key neq 'price') AND ($key neq 'quota') AND ($key neq 'return')"}
+                    {if condition="($key neq 'price') AND ($key neq 'quota') AND ($key neq 'return') AND ($key neq 'integral')"}
                     <td style="text-align: center"><span>{$item}</span><input type="hidden" name="attr[{$k}][{$key}]" class="layui-input" value="{$item}"></td>
                     {else/}
                     <td><input type="number" name="attr[{$k}][{$key}]" class="layui-input max" value="{$item}" min="0" max="{if condition="$key eq 'quota'"}{$vo['stock']}{else/}{$vo['ot_price']}{/if}" oninput="checknum(this)"></td>