biz9-logic 4.9.27 → 4.9.32

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='8.9.7'
+VERSION='9.0.2'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -166,9 +166,7 @@ class Demo_Logic {
 		return item;
 	};
 }
-
 class Type {
-
 	static get_stat_type_list = () =>{
 		return [
 			{title:Type.get_title(Type.STAT_VIEW),type:Type.STAT_VIEW,label:Type.get_title(Type.STAT_VIEW),value:Type.STAT_VIEW},
@@ -178,10 +176,10 @@ class Type {
 			{title:Type.get_title(Type.STAT_FAVORITE),type:Type.STAT_FAVORITE,label:Type.get_title(Type.STAT_FAVORITE),value:Type.STAT_FAVORITE},
 			{title:Type.get_title(Type.STAT_CART),type:Type.STAT_CART,label:Type.get_title(Type.STAT_CART),value:Type.STAT_CART},
 			{title:Type.get_title(Type.STAT_ORDER),type:Type.STAT_ORDER,label:Type.get_title(Type.STAT_ORDER),value:Type.STAT_ORDER},
+			{title:Type.get_title(Type.STAT_ORDER_PAYMENT),type:Type.STAT_ORDER_PAYMENT,label:Type.get_title(Type.STAT_ORDER_PAYMENT),value:Type.STAT_ORDER_PAYMENT},
 			{title:Type.get_title(Type.STAT_REVIEW),type:Type.STAT_REVIEW,label:Type.get_title(Type.STAT_REVIEW),value:Type.STAT_REVIEW},
 		]
 	};
-
 	//page
 	static PAGE_ABOUT='about';
 	static PAGE_CONTACT='contact';
@@ -211,6 +209,7 @@ class Type {
 	static STAT_FAVORITE='favorite_post';
 	static STAT_CART='cart_post';
 	static STAT_ORDER='order_post';
+	static STAT_ORDER_PAYMENT='order_payment_post';
 	static STAT_REVIEW='review_post';
 	//template
 	static TEMPLATE_PRIMARY='primary';
@@ -394,37 +393,59 @@ class Stat_Logic {
 		let action_url="item/search_activity";
 		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static get_new = (user_id,parent_data_type,parent_id,stat_type,data)=>{
-		return {
-			user_id:user_id,
-			parent_data_type:parent_data_type,
-			parent_id:parent_id,
-			type:stat_type,
-			data:data
-		}
-	}
 	static get_new_user = (user_id,stat_type,data)=>{
 		return {
 			user_id:user_id,
 			type:stat_type,
 			data:data,
 		}
-	}
+	};
 	static get_new = (user_id,stat_type,parent_item_list,data)=>{
-		return {
-			user_id:user_id,
-			type:stat_type,
-			parent_item_list:parent_item_list,
-			data:data,
-		}
-	}
+		let stat_list = [];
+		for(const item of parent_item_list){
+			let stat = DataItem.get_new(DataType.STAT,0);
+			stat.user_id=user_id;
+			stat.type=stat_type;
+			if(item.parent_id){
+				stat.parent_id=item.parent_id;
+			}
+			if(item.parent_data_type==DataType.PRODUCT || item.parent_data_type==DataType.SERVICE  || item.parent_data_type==DataType.EVENT ){
+				stat.parent_data_type=item.parent_data_type;
+				stat.parent_id=item.parent_id;
+				stat.parent_cost = item.cost;
+				stat.parent_quanity = item.quanity;
+			}
+			if(item.data_type==DataType.CART_ITEM){
+				stat.parent_data_type=item.parent_data_type;
+				stat.parent_id=item.parent_id;
+				stat.parent_cart_id = item.cart_id;
+				stat.parent_cart_number = item.cart_number;
+			}
+			if(item.data_type==DataType.ORDER){
+				stat.parent_data_type=item.data_type;
+				stat.parent_id=item.id;
+				stat.parent_order_id = item.order_id;
+				stat.parent_order_number = item.order_number;
+			}
+			if(item.data_type==DataType.ORDER_PAYMENT){
+				stat.parent_data_type=item.data_type;
+				stat.parent_id=item.id;
+				stat.parent_order_number = item.order_number;
+				stat.parent_payment_method_type = item.payment_method_type;
+				stat.parent_payment_amount = item.payment_amount;
+				stat.parent_transaction_id = item.transaction_id;
+			}
+			stat_list.push(stat);
+		};
+		return stat_list;
+	};
 	static get_new_activity = (user_id,stat_type,activity_data)=>{
 		return {
 			user_id:user_id,
 			type:stat_type,
 			activity:data,
 		}
-	}
+	};
 }
 class Page_Logic {
 	static get_page_list(){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.9.27",
+  "version": "4.9.32",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/test.js

@@ -31,10 +31,7 @@ describe("connect", () => {
         series([
             function(call) {
                 console.log('CONNECT-START');
-
-                let post_cart = {};
                 //let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0,);
-                Log.w('11_type',Type.get_stat_list());
                 //let post_cart_list = [];
                 //let post_cart_item = Cart_Logic.get_new_cart_item(DataType.PRODUCT,123,post_cart.cart_number,1,30);
                 //let post_cart_sub_item = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,10);