0821-0219-h01

app/controller/merchant/Goods.php

@@ -192,6 +192,7 @@ class Goods extends Base
 //            return errorTrans("error.data");
             if (empty($data['product_id'])) return error($data['description']);
             $param['goods_id'] = $data['product_id'];
+            $param['is_new'] = 1;
 //            return errorTrans("error.data");
             $stateSku = false;
             if (!empty($skuData)) {

app/controller/v2/Auth.php

@@ -94,7 +94,7 @@ class Auth extends Base
                 $data = $this->decrypt($param['encryptedData'],$sessionKey['session_key'],$param['iv']);
                 $mobileStr = $data['purePhoneNumber'];
             }
-            if (empty($mobileStr)) return error("授权信息获取失败");
+            if (empty($mobileStr)) return error("授权信息获取失败!!");
             $mobile = $this->decrypt2code(sConf('wechat.min_private_key'), $mobileStr);
             $map = ["openid" => $sessionKey['openid']];
             $user = $this->model->where($map)->findOrEmpty();

app/controller/v2/Chat.php

@@ -106,7 +106,6 @@ class Chat extends Base
             $star = (new SaasService)->where("poi_id",$param['poi'])->with(['quick'])->findOrEmpty();
             // 获取在线客服
             $service = (new SystemUser)->where(['store_id' => $param['poi'],"type" => 3,"is_line" => 1])->order("last_msg_at","asc")->findOrEmpty();
-            print_r($service->toArray());
             if ($service->isEmpty()) { // 无客服在线
                 return success("ok",[
                     "avatar"    => $userAvatar,

app/controller/v2/Order.php

@@ -49,6 +49,30 @@ class Order extends Base
         }
     }
 
+
+    #[GetMapping('chat')]
+    public function getDataListChat(Request $request): Response
+    {
+        try {
+            $param = $request->all();
+            if (!empty($param['size'])) {
+                $param['pageSize'] = $param['size'];
+            }
+            if (empty($param['status'])) {
+                $param['statusGt'] = 1;
+            }
+//            $param['openid'] = $request->user['openid'];
+            $data = $this->service->setModel()->getList($param,['product' => function($query){
+                $query->field("product_id,product_name,price");
+            },'poi' => function($query){
+                $query->field("poi_id,poi_name");
+            }]);
+            return successTrans("success.data",pageFormat($data));
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
+
     #[GetMapping('detail')]
     public function getDataDetail(Request $request): Response
     {

app/extra/dyLife/BasicLife.php

@@ -89,6 +89,7 @@ class BasicLife
     {
         print_r($this->header);
         $result = Http::asJson()->withHeaders($this->header)->post($this->gateway.$url,$data)->array();
+        print_r($result);
         if (isset($result['err_no']) && $result['err_no'] <> 0) return ['msg' => $result['err_msg']];
         if(!empty($result[$field]))
         {

app/extra/dyLife/data/BaseData.php

@@ -30,6 +30,7 @@ class BaseData extends BasicLife
                 $sku_attrs[$val['key']] = $keyVal;
             }
         }
+        $data['product_name'] = ($data['price']/100)."元代".($data['line_price']/100)."元商场权益券".$data['product_name'];
         $param = [
             "account_id"    => $store['store_id'], // 商家id
             "product" => [
@@ -59,9 +60,9 @@ class BaseData extends BasicLife
         if (empty($sku)) { // 单sku
             $param['sku'] = [
                 "attr_key_value_map"    => $sku_attrs,
-                "actual_amount" => $type=='edit'?($data['price']*100):$data['price'], // 售价 实际支付价格
+                "actual_amount" => $type=='edit'?round($data['price']*100):round($data['price']), // 售价 实际支付价格
                 "sku_name"      => $data['product_name'], // sku名
-                "origin_amount" => $type=='edit'?($data['line_price']*100):$data['line_price'],
+                "origin_amount" => $type=='edit'?round($data['line_price']*100):round($data['line_price']),
                 "status"        => 1,
                 "stock"         => [
                     "limit_type"    => $data['limit_use_rule'], // 库存上限类型，为2时stock_qty和avail_qty字段无意义 1 有限库存 2 无限库存
@@ -104,7 +105,7 @@ class BaseData extends BasicLife
                     foreach ($val['list'] as $sKey=>$sub) {
                         $commodity[$key]['item_list'][$sKey] = [
                             "name"  => $sub['name'],
-                            "price" => $sub['price'] * 100,
+                            "price" => round($sub['price'] * 100),
                             "count" => 1,
                             "unit"  => "份"
                         ];
@@ -183,7 +184,8 @@ class BaseData extends BasicLife
                 }
                 break;
             case "show_channel":
-                $return = (string) $data['show_channel'];
+//                $return = (string) $data['show_channel'];
+                $return = "1";
                 break;
             case "use_date": // 使用日期 券码的可以核销日期，履约核销强依赖
                 if ($data['use_date_type'] == 1) { // 指定天数
@@ -220,7 +222,8 @@ class BaseData extends BasicLife
                 $return = "true";
                 break;
             case "code_source_type": // 券码生成方式 "1-抖音码 2-三方码 3-预导码
-                $return = $data['code_source_type']?(string)$data['code_source_type']:"1";
+//                $return = $data['code_source_type']?(string)$data['code_source_type']:"2";
+                $return = 2;
                 break;
             case "settle_type": // 收款方式 1-总店结算 2-分店结算
 //                $return = $data['code_source_type']?(string)$data['code_source_type']:"2";