季度奖，数据表和存储过程修改

sql/upgrade/1350.sql

@@ -28,7 +28,7 @@ CREATE TABLE `AR_CALC_BONUS_QUARTER`  (
   `MANAGE_TAX` decimal(16, 3) NULL DEFAULT NULL,
   `AMOUNT` decimal(16, 3) NULL DEFAULT NULL,
   `RECONSUME_POINTS` decimal(16, 3) NULL DEFAULT NULL,
-  `CALC_YEAR` int(11) NULL DEFAULT NULL,
+  `LAST_DEC_LV` varchar(32)  CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
   `CALC_MONTH` int(11) NULL DEFAULT NULL,
   `PERIOD_NUM` int(11) NULL DEFAULT NULL,
   `CREATED_AT` datetime(0) NOT NULL,
@@ -59,4 +59,5 @@ CREATE TABLE `AR_QTR_CALC_SCORE`  (
 ) ENGINE = InnoDB AUTO_INCREMENT = 256 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 alter table `AR_CALC_BONUS` add column ORI_BONUS_QUARTER decimal(16,2) not null default 0.00 comment "季度奖-原奖金";
-alter table `AR_CALC_BONUS` add column BONUS_QUARTER decimal(16,2) not null default 0.00 comment "季度奖";
+alter table `AR_CALC_BONUS` add column BONUS_QUARTER decimal(16,2) not null default 0.00 comment "季度奖";
+ALTER TABLE `AR_CALC_BONUS_QUARTER` ADD COLUMN LAST_DEC_LV varchar(32)  CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;

sql/upgrade/QTRCALC.sql

@@ -1,4 +1,4 @@
-CREATE DEFINER=`black_tea_0309`@`%` PROCEDURE `QTRCALC`(IN `PCPID` INT)
+CREATE DEFINER=`babysbreath`@`%` PROCEDURE `QTRCALC`(IN `PCPID` INT)
 LABEL: BEGIN
 -- DECLARE QTRSTARTPID, QTRSTARTMONTH, THISYEAR, THISMONTH, MISMONTH INT;
 
@@ -98,8 +98,6 @@ SET BONUSPERU = TBONUS / TOTALU;
 CALL QTRCALCRECORD(5,'计算每一份奖金',PCPID,NOW());
 COMMIT;
 
-
-
 INSERT INTO AR_QTR_CALC_USER
 	SELECT 
 		NULL AS ID,
@@ -111,21 +109,26 @@ INSERT INTO AR_QTR_CALC_USER
 	FROM
 		AR_QTR_CALC_SCORE AS SC;
 
+CALL QTRCALCRECORD(6,'写入user表',PCPID,NOW());
+COMMIT;
 
 INSERT INTO AR_CALC_BONUS_QUARTER
 	SELECT
 		NULL AS ID,
-		USER_ID,
-		AMOUNT AS ORI_BONUS,
+		AU.USER_ID,
+		AU.AMOUNT AS ORI_BONUS,
 		0 AS MANAGE_TAX,
-		AMOUNT,
+		AU.AMOUNT,
 		0 AS RECONSUME_POINTS,
-		CALC_YEAR, 
-		CALC_MONTH, 
-		PERIOD_NUM,
+		U.DEC_LV,
+		AU.CALC_MONTH, 
+		AU.PERIOD_NUM,
 		NOW() AS CREATE_AT
 	FROM
-		AR_QTR_CALC_USER;
+		AR_QTR_CALC_USER AS AU
+	 LEFT JOIN
+	  AR_USER AS U
+	 ON AU.USER_ID = U.ID ;
 
 CALL QTRCALCRECORD(20,'写入季度奖金表',PCPID,NOW());
 COMMIT;