Merge pull request 'preview' (#17) from preview into master

Reviewed-on: #17

app/common/repositories/system/merchant/MerchantIntentionRepository.php

@@ -116,7 +116,7 @@ class MerchantIntentionRepository extends BaseRepository
 
         $margin = app()->make(MerchantTypeRepository::class)->get($intention['mer_type_id']);
         $data['is_margin'] = $margin['is_margin'] ?? -1;
-        $data['margin'] = 0;
+        $data['margin'] = $margin['margin'] ?? 0;
         $merData = [];
         if ($create) {
             $password = substr($intention['phone'], -6);
@@ -138,9 +138,7 @@ class MerchantIntentionRepository extends BaseRepository
                 'mer_password' => $password,
                 'is_margin' => $margin['is_margin'] ?? -1,
                 // 用户需缴纳保证金
-                'recharge_margin' => $margin['margin'] ?? 0,
-                // 用户已缴纳保证金
-                'margin' => 0,
+                'margin' => $margin['margin'] ?? 0,
                 'uid' => $intention['uid'],
                 'reg_admin_id' => $autoCreate ? 0: request()->adminId(),
                 'mer_intention_id' => $id

app/controller/api/Auth.php

@@ -286,7 +286,7 @@ class Auth extends BaseController
             'uid' => $user['uid'],
             'mer_id' => $merchant['mer_id'],
             'order_sn' => $orderSn,
-            'total_price' => $merchant['recharge_margin'],
+            'total_price' => $merchant['margin'],
             'pay_type' => 1,
             'create_time' => date('Y-m-d H:i:s')
         ]);
@@ -296,10 +296,10 @@ class Auth extends BaseController
             "mer_id" => $merchant['mer_id'],
             "pay_type" => 1,
             "attach" => "margin",
-            "order_info" => '{"is_margin":1,"margin":"' . $merchant['recharge_margin'] . '"}',
-            "pay_price" => $merchant['recharge_margin'],
+            "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
+            "pay_price" => $merchant['margin'],
             "order_sn" => $orderSn,
-            "body" => $merchant['mer_name'] . ' - ' . $merchant['recharge_margin'],
+            "body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
         ];
         $payType = 'weixinApp';
         $service = new PayService($payType, $param);
@@ -307,6 +307,15 @@ class Auth extends BaseController
         return app('json')->success($payInfo);
     }
 
+    public function marginList()
+    {
+        $user = $this->request->userInfo();
+        [$page, $limit] = $this->getPage();
+        $count = Db::name('margin_order')->where('uid', $user['uid'])->count();
+        $list = Db::name('margin_order')->where('uid', $user['uid'])->page($page, $limit)->order('order_id', 'desc')->select()->toArray();
+        return app('json')->success(compact('count', 'list'));
+    }
+
     /**
      * @return mixed
      * @throws DataNotFoundException

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

@@ -264,7 +264,7 @@ class Merchant extends BaseController
         if(empty($id)){
             return app('json')->fail('参数错误');
         }
-        $data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,recharge_margin,is_margin')->find();
+        $data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,paid_margin,is_margin')->find();
         return app('json')->success($data);
     }
 

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

@@ -196,7 +196,7 @@ class MerchantIntention extends BaseController
         $postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant';
         $res = $this->sendMerIntentionApply($sendData, $postUrl);
         if (!$res['ok']) {
-            Db::name('merchant_integntion')->where('mer_intention_id', $intentionId)->delete();
+            Db::name('merchant_intention')->where('mer_intention_id', $intentionId)->delete();
             throw new ValidateException('商户交易申请失败，' . $res['msg']);
         }
         Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->update(['business_status'=>1]);

app/listener/paySuccessMargin.php

@@ -21,10 +21,16 @@ class paySuccessMargin
                 'paid' => 1,
                 'pay_time' => date('Y-m-d H:i:s')
             ]);
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->inc('margin',$marginInfo['total_price']);
-            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->dec('recharge_margin',$marginInfo['total_price']);
             $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find();
-            if ($merchantInfo['recharge_margin'] <= 0) {
+            $paidMarginAmount = (float)$merchantInfo['paid_margin'] + (float)$marginInfo['total_price'];
+            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
+                'paid_margin' => $paidMarginAmount
+            ]);
+            $marginAmount = (float)$merchantInfo['margin'] - (float)$marginInfo['total_price'];
+            Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
+                'margin' => $marginAmount
+            ]);
+            if ($marginAmount <= 0) {
                 Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
                     'is_margin' => 10
                 ]);

public/static/js/pages-activity-combination_details-index.61e4d615.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-activity-combination_details-index"],{aa6c:function(i,n,o){"use strict";o.r(n);var a=o("f0c5"),t=Object(a["a"])({},void 0,void 0,!1,null,null,null,!1,void 0,void 0);n["default"]=t.exports}}]);

public/static/js/pages-annex-web_view-index.d4ce9ce9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-annex-web_view-index"],{"2a6d":function(t,n,e){"use strict";e.r(n);var i=e("e09f"),r=e("ca75");for(var u in r)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(u);var o=e("f0c5"),a=Object(o["a"])(r["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],void 0);n["default"]=a.exports},ca75:function(t,n,e){"use strict";e.r(n);var i=e("d044"),r=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=r.a},d044:function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={data:function(){return{windowH:0,windowW:0,webviewStyles:{progress:{color:"transparent"}},url:""}},onLoad:function(t){this.url=decodeURIComponent(t.url);try{var n=uni.getSystemInfoSync();this.windowW=n.windowWidth,this.windowH=n.windowHeight}catch(e){}}};n.default=i},e09f:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-web-view",{staticClass:"web-view",style:{width:this.windowW+"px",height:this.windowH+"px"},attrs:{"webview-styles":this.webviewStyles,src:this.url}})},r=[]}}]);

public/static/js/pages-error-index.de948729.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-error-index"],{"62cb":function(n,r,t){var e=t("24fb");r=e(!1),r.push([n.i,'@charset "UTF-8";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */.box[data-v-c7b95bea]{position:fixed;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);font-size:%?40?%;font-weight:700;color:#666;text-align:center}',""]),n.exports=r},"799d":function(n,r,t){"use strict";t.r(r);var e=t("ef3b"),a=t.n(e);for(var i in e)["default"].indexOf(i)<0&&function(n){t.d(r,n,(function(){return e[n]}))}(i);r["default"]=a.a},"7c27":function(n,r,t){"use strict";var e=t("d747"),a=t.n(e);a.a},"858b":function(n,r,t){"use strict";t.r(r);var e=t("96cb"),a=t("799d");for(var i in a)["default"].indexOf(i)<0&&function(n){t.d(r,n,(function(){return a[n]}))}(i);t("7c27");var o=t("f0c5"),c=Object(o["a"])(a["default"],e["b"],e["c"],!1,null,"c7b95bea",null,!1,e["a"],void 0);r["default"]=c.exports},"96cb":function(n,r,t){"use strict";t.d(r,"b",(function(){return e})),t.d(r,"c",(function(){return a})),t.d(r,"a",(function(){}));var e=function(){var n=this.$createElement,r=this._self._c||n;return r("v-uni-view",{staticClass:"box"},[this._v("网站已关闭")])},a=[]},d747:function(n,r,t){var e=t("62cb");e.__esModule&&(e=e.default),"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var a=t("4f06").default;a("34a2af53",e,!0,{sourceMap:!1,shadowMode:!1})},ef3b:function(n,r){}}]);