Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/Notify.php

@@ -159,12 +159,12 @@ class Notify
                             $fgj_pri=0;//推广者的佣金抽10%到个人复购金
 
                             $pv = 0; //待分配的PV
-
+                            $wenan = '';
 
                             //var_dump($store_product_data['concession_pri']);return;
                             //精彩生活
                             if($store_order_data['mer_id'] == 439){
-
+                                $wenan = '精彩生活';
 
                                 //分配参数
                                 $job_par = [];
@@ -398,7 +398,7 @@ class Notify
 
                                 //VIP专区
                             }else if($store_order_data['mer_id'] == 496){
-
+                                $wenan = '会员专区';
                                 //业务员和以上推广的等级获得推广佣金
                                 $le_yw_amount = 0;
                                 //获赠的贡献值和积分
@@ -744,6 +744,7 @@ class Notify
 
 
                             } else {
+                                $wenan = '商贸区';
                                 // 商贸区
                                 /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
                                 $merchant = app()->make(MerchantRepository::class);
@@ -897,6 +898,20 @@ class Notify
                                     if($vrpri  >= 0 ){
 
                                         Db::name("user")->where("uid", $user_data['uid'])->update(['score'=>$vrpri]);
+
+                                        //消费积分日志
+                                        $log_data = [
+                                            "uid" => $user_data['uid'],
+                                            "reward_socre" => $fzone_paytype['other'],
+                                            "addtime" => time(),
+                                            "status" => 1,
+                                            "order_id" => $store_order_data['order_id'],
+                                            "mark" => "购买" . $wenan . "商品消费积分:" . $array_fzone_paytype['other'],
+                                            "surplus" => $vrpri,
+                                            "pm" => 2,
+                                            "source_type" => 5
+                                        ];
+                                        Db::name("user_sign_score")->insert($log_data);
                                     }else{
                                         $note_arr = ["uid"=>$user_data['uid'],"dec_score"=>$array_fzone_paytype['other'],"rem_score"=>$user_data['score'],"msg"=>"积分不足","fzone_paytype"=>$store_order_data['fzone_paytype']];
                                         Db::name("test_log")->insert(['create_time'=>date('Y-m-d H:i:s'),'note'=>json_encode($note_arr, JSON_UNESCAPED_UNICODE)]);

app/controller/api/store/order/StoreRefundOrder.php

@@ -144,6 +144,19 @@ class StoreRefundOrder extends BaseController
             if (!$order) return app('json')->fail('订单状态错误');
             if ($order->status < 0) return app('json')->fail('订单已退款');
             if ($order->status == 4) return app('json')->fail('订单已申请退款');
+
+            // 目前退款即 是 全额退款 没有部分退款
+            $group_order_id = Db::name('store_order')
+                ->where('order_id', $order['order_id'])
+                ->value('group_order_id');
+            $group_order_map = Db::name('store_group_order')
+                ->where('group_order_id', $group_order_id)
+                ->field('pay_price,hf_pay_id')
+                ->find();
+            if (!empty($group_order_map['hf_pay_id'])) {
+                $data['refund_price'] = $group_order_map['pay_price'];
+            }
+
             if ($type == 1) {
                 $refund = $this->repository->refund($order, (int)$ids[0], $num, $uid, $data);
             } else {

app/controller/merchant/store/order/RefundOrder.php

@@ -120,6 +120,85 @@ class RefundOrder extends BaseController
             $data['status'] = $status;
             $this->repository->agree($id,$data,$this->request->adminId(),1);
 
+            // 获取订单金额
+            $store_order_info = Db::name('store_order')
+                ->where('order_id', $refund_order['order_id'])
+                ->find();
+            $group_order_map = Db::name('store_group_order')
+                ->where('group_order_id', $store_order_info['group_order_id'])
+                ->field('uid,pay_price,hf_pay_id,fzone_paytype')
+                ->find();
+            $make = '商贸区';
+            if ($store_order_info['mer_id'] == 439) {
+                $make = '精彩生活';
+            } else if ($store_order_info['mer_id'] == 496) {
+                $make = '会员专区';
+            }
+
+            // 如果是组合支付 现金 + 积分 则需要把积分退回
+            // 参考 app\controller\api\Notify.php -- 745 $array_fzone_paytype['type']=='b2'
+            $array_fzone_paytype = json_decode($group_order_map['fzone_paytype'], true);
+            if (!empty($array_fzone_paytype)) {
+                if ($array_fzone_paytype['type'] == 'b2') {
+                    // {"checked":true,"note":"现金+积分","other":1.5,"price":8.5,"total":0.0,"type":"b2","vr":"48799.82"}
+
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('score');
+                    $vrpri += $array_fzone_paytype['other'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['score' => $vrpri]);
+
+                    $data = [
+                        "uid" => $store_order_info['uid'],
+                        "reward_socre" => $array_fzone_paytype['other'],
+                        "addtime" => time(),
+                        "status" => 1,
+                        "order_id" => $store_order_info['order_id'],
+                        "mark" => "{$make}商品申请退款退回积分",
+                        "surplus" => $vrpri,
+                        "pm" => 1,
+                        "source_type" => 3
+                    ];
+                    Db::name("user_sign_score")->insert($data);//添加积分记录
+                } else if ($array_fzone_paytype['type'] == 'a3') {
+                    // {"checked":true,"note":"现金+VR","other":1.5,"price":8.5,"total":0.0,"type":"a3","vr":"48799.82"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('vr');
+                    $vrpri += $array_fzone_paytype['other'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['vr' => $vrpri]);
+
+                    //VR入账
+                    $insertdata = [
+                        'uid'=> $store_order_info['uid'],
+                        'number' =>  $array_fzone_paytype['other'],
+                        'surplus' => $vrpri,
+                        'mark' => "{$make}商品申请退款退回VR",
+                        'order_id'=> $store_order_info['order_id'],
+                        'type' => 2,
+                        'addtime' => time(),
+                        'settlement_time'=> date('Y-m-d H:i:s', time())
+                    ];
+                    Db::name('user_sign_vr')->insert($insertdata);
+
+                }
+                // else if ($array_fzone_paytype['type'] == 'c1') {
+                //     // {"checked":true,"note":"复购金","other":1.5,"price":8.5,"total":0.0,"type":"c1","vr":"48799.82"}
+                //     $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('fugou');
+                //     $vrpri += $array_fzone_paytype['other'];
+                //     Db::name("user")->where("uid", $group_order_map['uid'])->update(['fugou' => $vrpri]);
+                //     //支出账号存到log日志
+                //     $log_data = [
+                //         'uid' => $store_order_info['uid'],
+                //         'number' => $array_fzone_paytype['price'],
+                //         'mark' => "复购区商品申请退款退回复购金:" . $array_fzone_paytype['price'],
+                //         'desc' => "复购金",
+                //         'order_id' =>  $store_order_info['order_id'],
+                //         'surplus' => $vrpri,
+                //         'order_type' => 0,
+                //         'type' => 2,
+                //         'addtime' => time()
+                //     ];
+                //     $user_res_log = Db::name("user_sign_fugou")->insert($log_data);
+                // }
+            }
+
             // 取消 订单所发放的福利
             $this->repository->cancelOrderBonus($id);
         }else{