Merge branch 'dev' into dev-sxb

app/controller/admin/order/RefundOrder.php

@@ -121,6 +121,192 @@ class RefundOrder extends BaseController
 //            Db::name('log')->insert(['data'=>'这了'. 1]);
             $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 = '会员专区';
+            } else if ($store_order_info['mer_id'] == 491) {
+                $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'] == 'b1') {
+                    // VR+积分 {"checked":true,"note":"VR+积分","other":210.0,"price":970.0,"total":0.0,"type":"b1","vr":"47557.5"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('vr');
+                    $vrpri += $array_fzone_paytype['price'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['vr' => $vrpri]);
+                    Db::name("user_sign_vr")->insert([
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['price'],
+                        'mark' => "{$make}商品申请退款退回VR",
+                        'desc' => "VR",
+                        'order_type' => 0,
+                        'order_id' => $store_order_info['order_id'],
+                        'surplus' => $vrpri,
+                        'type' => 1,
+                        'addtime' => time()
+                    ]);
+
+                    // {"checked":true,"note":"VR+积分","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'] == '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'] == 'b3') {
+                    // VR+积分 {"checked":true,"note":"VR+积分","other":210.0,"price":970.0,"total":0.0,"type":"b1","vr":"47557.5"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('vr');
+                    $vrpri += $array_fzone_paytype['price'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['vr' => $vrpri]);
+                    Db::name("user_sign_vr")->insert([
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['price'],
+                        'mark' => "{$make}商品申请退款退回VR",
+                        'desc' => "VR",
+                        'order_type' => 0,
+                        'order_id' => $store_order_info['order_id'],
+                        'surplus' => $vrpri,
+                        'type' => 1,
+                        'addtime' => time()
+                    ]);
+
+                    // {"checked":true,"note":"VR+积分","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('jingdou');
+                    $vrpri += $array_fzone_paytype['other'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['jingdou' => $vrpri]);
+
+                    Db::name('user_sign_jingdou')->insert([
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['other'],
+                        'status' => 1,
+                        'mark' => "{$make}商品申请退款退回京豆",
+                        'addtime' => time(),
+                        'surplus' => $vrpri,
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                        'type' => 1,
+                        'order_type' => 0,
+                        'order_id' => $store_order_info['order_id']
+                    ]);
+                } else if ($array_fzone_paytype['type'] == 'b4') {
+                    // {"checked":true,"note":"现金+积分","other":1.5,"price":8.5,"total":0.0,"type":"b2","vr":"48799.82"}
+
+                    $jingdoupri = Db::name("user")->where("uid", $group_order_map['uid'])->value('jingdou');
+                    $jingdoupri += $array_fzone_paytype['other'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['jingdou' => $jingdoupri]);
+
+                    Db::name('user_sign_jingdou')->insert([
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['other'],
+                        'status' => 1,
+                        'mark' => "{$make}商品申请退款退回京豆",
+                        'addtime' => time(),
+                        'surplus' => $jingdoupri,
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                        'type' => 1,
+                        'order_type' => 0,
+                        'order_id' => $store_order_info['order_id']
+                    ]);
+                } else if ($array_fzone_paytype['type'] == 'b5') {
+                    // {"checked":true,"note":"VR","other":0.0,"price":1.0,"total":0.0,"type":"b5","vr":"10"}
+                    $vrpri = Db::name("user")->where("uid", $group_order_map['uid'])->value('vr');
+                    $vrpri += $array_fzone_paytype['price'];
+                    Db::name("user")->where("uid", $group_order_map['uid'])->update(['vr' => $vrpri]);
+                    Db::name("user_sign_vr")->insert([
+                        'uid' => $store_order_info['uid'],
+                        'number' => $array_fzone_paytype['price'],
+                        'mark' => "{$make}商品申请退款退回VR",
+                        'desc' => "VR",
+                        'order_type' => 0,
+                        'order_id' => $store_order_info['order_id'],
+                        'surplus' => $vrpri,
+                        'type' => 1,
+                        'addtime' => time()
+                    ]);
+                } 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{
             $fail_message = $this->request->param('fail_message','');
             if($status == -1 && empty($fail_message)){

app/controller/api/store/merchant/Taskorderguquan.php

@@ -18,50 +18,30 @@ class Taskorderguquan
     {
 
         /**
-         * 请根据内容：
-         * 6250元补贴下面人员
-         * 13231658486周行体1000
-         * 13333069689魏惠新1500
-         * 13959100621周金花300
-         * 13701061395李素红300
-         * 17501006833邢艳丽300
-         * 15631982690魏震洪300
-         * 18603401312黄金花200
-         * 13521438652徐立苹200
-         * 15832971815孟晓玮300
-         * 18600200909陈冠霖300
-         * 15810064711 王   玲 300
-         * 13932925303会强300
-         * 13601071082隋彩云200
-         * 13161909228刘银霞50
-         * 18760167163刘春梅50
-         * 18911752386魏利琴50
-         * 13215917919李小秋50
-         * 15332507711张传莲50
-         * 18715313601大饼500
-         * 23750元做合伙人分红
-         * 共计3万
- */
+        13231658486周行体300
+        13333069689魏惠新300
+        15832971815孟晓玮300
+        13959100621周金花300
+        13701061395李素红100
+        15810064711 王   玲 200
+        13521438652徐立苹100
+        18760167163刘春梅50
+        15332507711张传莲50
+        15960349661吕丽娣50
+        18715313601大饼200
+        */
         $data = [
-            '13231658486' => 1000,
-            '13333069689' => 1500,
-            '13959100621' => 300,
-            '13701061395' => 300,
-            '17501006833' => 300,
-            '15631982690' => 300,
-            '18603401312' => 200,
-            '13521438652' => 200,
+            '13231658486' => 300,
+            '13333069689' => 300,
             '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 300,
-            '13601071082' => 200,
-            '13161909228' => 50,
+            '13959100621' => 300,
+            '13701061395' => 100,
+            '15810064711' => 200,
+            '13521438652' => 100,
             '18760167163' => 50,
-            '18911752386' => 50,
-            '13215917919' => 50,
             '15332507711' => 50,
-            '18715313601' => 500
+            '15960349661' => 50,
+            '18715313601' => 200,
         ];
 
         $result = Db::name("user")