Merge branch 'test' of ssh://git.qgmzbxs.com:23333/q792602257/qlg.backend into test

hyhproject/app/model/Carts.php

@@ -115,7 +115,7 @@ class Carts extends CCarts{
 			$tm->setTable('shops');
 			//当前销售值
 			$nowSaleMoney =  $tm->getSum(['userId'=>$rs['shopUserId']],'helpSaleMoney');
-			if(($nowSaleMoney+$rs['shopPrice']) > $maxSaleMoney ){
+			if($nowSaleMoney > $maxSaleMoney ){
 				exit(jsonReturn('当前助微吧商户可销售额不足！',-1));
 			}