Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

# Conflicts:
#	sql.sql

app-ghs/controllers/MainController.php

@@ -124,6 +124,7 @@ class MainController extends BaseController
         $mobile = $admin['mobile'] ?? '';
         $sjName = $sj['merchantName'] ?? '';
         $shopName = $shop['shopName'] ?? '';
+        $cashAccount = $shop['cashAccount'] ?? '';
         $data = [
             'balance' => $balance,
             'txBalance' => $txBalance,
@@ -133,6 +134,7 @@ class MainController extends BaseController
             'sjName' => $sjName,
             'shopName' => $shopName,
             'shopImg' => $shopImg,
+            'cashAccount' => $cashAccount,
         ];
         util::success($data);
     }

biz-ghs/merchant/models/MerchantExtend.php

@@ -11,7 +11,7 @@ class MerchantExtend extends Base
 	 */
 	public static function tableName()
 	{
-		return 'xhSjExtend';
+		return 'xhSjExt';
 	}
 	
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -188,6 +188,7 @@ class PurchaseOrderClass extends BaseClass
 
         $orderData['itemInfo'] = $itemData;
         $orderData['statusName'] = self::getStatusName($orderData['status']);
+
         return $orderData;
     }
 

biz-hd/saas/models/ApplyExtend.php

@@ -9,7 +9,7 @@ class ApplyExtend extends Base
 	
 	public static function tableName()
 	{
-		return 'xhApplyExtend';
+		return 'xhApplyExt';
 	}
 	
 }

biz-mall/merchant/models/MerchantExtend.php

@@ -9,7 +9,7 @@ class MerchantExtend extends Base
 
 	public static function tableName()
 	{
-		return 'xhSjExtend';
+		return 'xhSjExt';
 	}
 	
 }

biz/sj/models/MerchantExtend.php

@@ -11,7 +11,7 @@ class MerchantExtend extends Base
 	 */
 	public static function tableName()
 	{
-		return 'xhSjExtend';
+		return 'xhSjExt';
 	}
 	
 }

common/models/xhMerchantExtend.php

@@ -7,7 +7,7 @@ class xhMerchantExtend extends xhBaseModel
 
     public static function tableName()
     {
-        return 'xhSjExtend';
+        return 'xhSjExt';
     }
 
 }

sql.sql

@@ -1750,3 +1750,12 @@ CREATE TABLE `xhShopExpress` (
   `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='门店快递配置表';
+=======
+ALTER TABLE xhGhsPurchaseOrder ADD `prePrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '应付款，原价，未修改价格，打折前' AFTER `price`;
+ALTER TABLE xhGhsPurchaseOrder ADD `actPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '实际付款，实价，修改后价格，打折后，包括运费' AFTER `prePrice`;
+ALTER TABLE xhGhsPurchaseOrder ADD kind TINYINT NOT NULL DEFAULT 0 COMMENT '多少种花材' AFTER `smallNum`;
+ALTER TABLE xhGhsPurchaseOrder ADD debt TINYINT NOT NULL DEFAULT 0 COMMENT '是否欠款 0正常 1欠款' AFTER `actPrice`;
+ALTER TABLE xhGhsPurchaseOrder MODIFY `status` TINYINT NOT NULL DEFAULT 1 COMMENT '订单状态 1待付款 2待发货 3配送中 4已签收 5已入库 6已取消';
+ALTER TABLE xhSjExtend RENAME TO xhSjExt;
+ALTER TABLE xhApplyExtend RENAME TO xhApplyExt;
+