update

prjcenter/prjKLY/base/AboutActivity.php

@@ -3275,7 +3275,6 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                             $payBizId = $bizInfo["id"];
                             if ($nowPayMoney <= 0) {
                                 bizbase_paySuccess($payBizCatalog, $payBizId, false, "manhandle");
-                                exit;
                                 return array("payResult" => true);
                             } else {
                                 //---------------------------------------
@@ -3816,7 +3815,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     /*if (intval($workInfo["status"]) != 4) {
                     throw new GeneralException("", "此订单不是待结算状态，请核查！");
                     }*/
-                    if (!in_array(intval($workInfo["status"]), [2, 4])) {
+                    if (!in_array(intval($workInfo["status"]), [2, 3, 4])) {
                         throw new GeneralException("", "此订单不是可结算状态，请核查！");
                     }
                 }
@@ -4098,8 +4097,10 @@ function bizbase_todoWorkPayCore($prePayArgs, $bizArgs)
         $sqlParam[":id"] = intval($bizInfo["id"]);
         $sqlParam[":wxmina_appid"] = $wxmina_appid;
         $sqlParam[":wxmina_openid"] = $wxmina_openid;
+        $outtradeno = substr(date('YmdHiis') . md5(uniqid()), 0, 32);
+        $sqlParam[":outtradeno"] = $outtradeno;
         $sqlTemp = "  update biz_trader_account set";
-        $sqlTemp .= "   wxmina_appid=:wxmina_appid,wxmina_openid=:wxmina_openid ";
+        $sqlTemp .= "   wxmina_appid=:wxmina_appid,wxmina_openid=:wxmina_openid,weixin_outtradeno=:outtradeno";
         $sqlTemp .= " where id=:id; ";
         $dataset = pdo_query3($sqlTemp, $sqlParam);
         //---------------------------------------
@@ -4108,7 +4109,8 @@ function bizbase_todoWorkPayCore($prePayArgs, $bizArgs)
         $prePayInfo["mchId"] = WeiXinPay_mchId;
         $prePayInfo["mch_paykeyV2"] = WeiXinPay_apiKey;
         $prePayInfo["mch_paykeyV3"] = WeiXinPay_apiKeyV3;
-        $prePayInfo["out_trade_no"] = $bizInfo["biz_idtag"];
+        $prePayInfo["out_trade_no"] = $outtradeno;
+        //$prePayInfo["out_trade_no"] = $bizInfo["biz_idtag"];
         $prePayInfo["total"] = "{$payTotal}";
         $prePayInfo["description"] = "订单支付业务";
         $prePayInfo["openid"] = $wxmina_openid;
@@ -5913,8 +5915,10 @@ function bizbase_mactivityPayCore($prePayArgs, $bizArgs)
         $sqlParam[":id"] = intval($bizInfo["id"]);
         $sqlParam[":wxmina_appid"] = $wxmina_appid;
         $sqlParam[":wxmina_openid"] = $wxmina_openid;
+        $outtradeno = substr(date('YmdHiis') . md5(uniqid()), 0, 32);
+        $sqlParam[":outtradeno"] = $outtradeno;
         $sqlTemp = "  update biz_worker_account set";
-        $sqlTemp .= "   wxmina_appid=:wxmina_appid,wxmina_openid=:wxmina_openid ";
+        $sqlTemp .= "   wxmina_appid=:wxmina_appid,wxmina_openid=:wxmina_openid,weixin_outtradeno=:outtradeno";
         $sqlTemp .= " where id=:id; ";
         $dataset = pdo_query3($sqlTemp, $sqlParam);
         //---------------------------------------
@@ -5923,7 +5927,8 @@ function bizbase_mactivityPayCore($prePayArgs, $bizArgs)
         $prePayInfo["mchId"] = WeiXinPay_mchId;
         $prePayInfo["mch_paykeyV2"] = WeiXinPay_apiKey;
         $prePayInfo["mch_paykeyV3"] = WeiXinPay_apiKeyV3;
-        $prePayInfo["out_trade_no"] = $bizInfo["biz_idtag"];
+        //$prePayInfo["out_trade_no"] = $bizInfo["biz_idtag"];
+        $prePayInfo["out_trade_no"] = $outtradeno;
         $prePayInfo["total"] = "{$payTotal}";
         $prePayInfo["description"] = "营销活动支付业务";
         $prePayInfo["openid"] = $wxmina_openid;

prjcenter/prjKLY/base/AboutWorker.php

@@ -135,19 +135,22 @@ function bizbase_workerAccountInfo($bizWorker)
             case 3: //微信充值
                 $wxchargein = round(floatval($item["total"]), 2);
                 break;
-            case 5: //解冻报名押金 超时自动解冻
-                $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
-                break;
+            /*case 5: //解冻报名押金 超时自动解冻
+            $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
+            break;
+            case 7: //解冻报名押金
+            $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
+            //$frozenIn = round(floatval($item["total"]), 2);
+            break;*/
             case 7: //解冻报名押金
-                $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
-                //$frozenIn = round(floatval($item["total"]), 2);
+                $frozenIn = round(floatval($item["total"]), 2);
                 break;
         }
     }
-    //$frozenBalance = round($frozenOut - $frozenIn, 2); //冻结余额，即当前实际冻结的金额
-    $frozenSql = "select ifnull(sum(ifnull(money,0)),0) as sum from biz_worker_account where biz_id in (select id from biz_todowork as btw where btw.biz_workerid=:workerid and btw.`status` in (1,2,4) ) and biz_catalog=2";
-    $frozenBalance = pdo_fetch($frozenSql, [':workerid' => intval($bizWorker["id"])]);
-    $frozenBalance = round(floatval($frozenBalance['sum']), 2);
+    $frozenBalance = round($frozenOut - $frozenIn, 2); //冻结余额，即当前实际冻结的金额
+    //$frozenSql = "select ifnull(sum(ifnull(money,0)),0) as sum from biz_worker_account where biz_id in (select id from biz_todowork as btw where btw.biz_workerid=:workerid and btw.`status` in (1,2,4) ) and biz_catalog=2";
+    //$frozenBalance = pdo_fetch($frozenSql, [':workerid' => intval($bizWorker["id"])]);
+    //$frozenBalance = round(floatval($frozenBalance['sum']), 2);
     $balance = round($income - $outgoing, 2);
     return array(
         "balance" => $balance,

prjcenter/prjKLY/base/common.php

@@ -153,7 +153,8 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                //$out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {
@@ -312,7 +313,8 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                //$out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {
@@ -437,7 +439,8 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
+                //$out_trade_no = $bizInfo["biz_idtag"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {
@@ -480,7 +483,8 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
+                //$out_trade_no = $bizInfo["biz_idtag"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {
@@ -533,7 +537,8 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                //$out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {
@@ -576,7 +581,7 @@ function bizbase_paySuccess($payBizCatalog, $payBizId, $needQuery = false, $hand
                 require_once WEB_PHY_ROOT . "/base/wxsrv.php";
                 $wxmina_appid = $bizInfo["wxmina_appid"];
                 $wxmina_openid = $bizInfo["wxmina_openid"];
-                $out_trade_no = $bizInfo["biz_idtag"];
+                $out_trade_no = !isset($bizInfo["weixin_outtradeno"]) || empty($bizInfo["weixin_outtradeno"]) ? $bizInfo["biz_idtag"] : $bizInfo["weixin_outtradeno"];
                 $backdata = weixin_orderqueryV3($wxmina_appid, $out_trade_no, null);
                 if ($backdata["trade_state"] == "SUCCESS") {
                 } else {

说明/目录结构.txt

@@ -52,3 +52,165 @@ ajaxEntryCenter.php 接口入口文件
 AjaxResultClass.php 回执规范化文件
 exception2log.php 自定义异常处理
 index.php 无用
+
+
+
+function bizbase_todoWorkTeamStatusName($statusCode)
+{
+    switch (intval($statusCode)) {
+        case 0:
+            $statusName = "待成团";
+            break;
+        case 1:
+            $statusName = "已成团待提交报名";
+            break;
+        case 2:
+            $statusName = "已解散";
+            break;
+        case 3:
+            $statusName = "已报名待审核";
+            break;
+        case 4:
+            $statusName = "报名已审核通过";
+            break;
+        case 5:
+            $statusName = "报名被驳回";
+            break;
+        case 6:
+            $statusName = "被违约";
+            break;
+        case 7:
+            $statusName = "主动取消报名";
+            break;
+        case 8:
+            $statusName = "被动取消报名";
+            break;
+    }
+    return $statusName;
+}
+function bizbase_todoWorkSubTeamStatusName($statusCode)
+{
+    switch (intval($statusCode)) {
+        case 0: //0-待参团；1-已提交参团；2-已入团；-1-参团被驳回；-2-参团被踢出；-3-已解散；-4-被动取消；
+            $statusName = "待参团";
+            break;
+        case 1:
+            $statusName = "已提交参团";
+            break;
+        case 2:
+            $statusName = "已入团";
+            break;
+        case -1:
+            $statusName = "参团被驳回";
+            break;
+        case -2:
+            $statusName = "参团被踢出";
+            break;
+        case -3:
+            $statusName = "已解散";
+            break;
+        case -4:
+            $statusName = "被动取消";
+            break;
+    }
+    return $statusName;
+}
+function bizbase_todoWorkTeamRoleName($mode)
+{
+    switch (intval($mode)) {
+        case 0:
+            $roleName = "单干";
+            break;
+        case 1:
+            $roleName = "开团";
+            break;
+        case 2:
+            $roleName = "参团";
+            break;
+    }
+    return $roleName;
+}
+function bizbase_todoWorkStatusName($statusCode)
+{
+    switch (intval($statusCode)) {
+        case 0:
+            $statusName = "已下单待付押金";
+            break;
+        case 1:
+            $statusName = "已报名待录用";
+            break;
+        case 2:
+            $statusName = "已录用待开工";
+            break;
+        case -1:
+            $statusName = "报名被驳回";
+            break;
+        case 3:
+            $statusName = "已开始工作";
+            break;
+        case 4:
+            $statusName = "已结束工作待结算";
+            break;
+        case 5:
+            $statusName = "已结算";
+            break;
+        case 90:
+            $statusName = "拒绝支付待审核";
+            break;
+        case -2:
+            $statusName = "取消报名";
+            break;
+        case -3:
+            $statusName = "被违约";
+            break;
+        case -4:
+            $statusName = "被动取消";
+            break;
+        case -5:
+            $statusName = "拒绝支付";
+            break;
+        case -6:
+            $statusName = "未开始工作";
+            break;
+        case -7:
+            $statusName = "未结束工作";
+            break;
+        case -8:
+            $statusName = "超48小时未结算";
+            break;
+    }
+    return $statusName;
+}
+
+workeraccount_biz_catalog
+type 0
+0://工资收入
+1://佣金收入
+2://营销活动支付
+3://微信充值
+//5://解冻报名押金 超时自动解冻
+7://解冻报名押金
+type 1
+0://提现支出
+1://活动支出
+2://冻结总额
+traderaccount_biz_catalog
+type 0
+0://次数支付
+1://支付工单
+2://微信支付充值
+3://转帐收入
+6://工单费用解冻
+type 1
+0://次数支出
+1://工单平台分成支出
+2://工单佣金支出
+3://工单工资支出
+4://转帐支出
+5://提现支出
+6://工单整体支出
+7://平台代支付工单
+8://冻结工单费用
+
+
+account_type 0-收入；1-支出；//2-冻结?