订单添加字段-回传相关修改2

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/AdsOrderDetailTotalVO.java

@@ -26,16 +26,5 @@ public class AdsOrderDetailTotalVO {
     @ApiModelProperty(notes = "回传金额")
     private Long backMoney;
 
-    /**
-     * 角色累计充值金额
-     */
-    @ApiModelProperty(notes = "角色累计充值金额")
-    private BigDecimal roleTotalAmount;
-
-    /**
-     * 角色累计充值次数
-     */
-    @ApiModelProperty(notes = "角色累计充值次数")
-    private Long roleTotalAmountCount;
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/AdsOrderDetailVO.java

@@ -226,4 +226,10 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "回传所需id")
     private Long backId;
 
+    /**
+     * 角色注册7日内订单数
+     */
+    @ApiModelProperty(notes = "角色注册7日内订单数")
+    private Long roleOrder7DayTotal;
+
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AdsOrderDetailService.java

@@ -414,7 +414,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
                  		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                 		l.back_money as back_money, -- 回传金额
+                 		IFNULL(l.back_money / 100, null) as back_money, -- 回传金额
                  		l.back_msg as back_msg, -- 回传信息
                  		l.id as back_id, -- 回传id
                  		l.back_table_name as back_table_name -- 回传表名
@@ -555,7 +555,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
                  		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                 		l.back_money as back_money, -- 回传金额
+                 		IFNULL(l.back_money / 100, null) as back_money, -- 回传金额
                  		l.back_msg as back_msg, -- 回传信息
                  		l.id as back_id, -- 回传id
                  		l.back_table_name as back_table_name -- 回传表名
@@ -642,9 +642,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 SELECT
                 	SUM(amount) as amount,
                 	SUM(real_amount) as real_amount,
-                	SUM(role_total_amount) as role_total_amount,
-                	SUM(role_total_amount_count) as role_total_amount_count,
-                	SUM(back_money) as back_money
+                	SUM(back_money) / 100 as back_money
                 FROM (
                 	SELECT
                 		a.id, -- 主键id
@@ -700,7 +698,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
                  		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                 		l.back_money as back_money, -- 回传金额
+                 		IFNULL(l.back_money / 100, null) as back_money, -- 回传金额
                  		l.back_msg as back_msg, -- 回传信息
                  		l.id as back_id, -- 回传id
                  		l.back_table_name as back_table_name -- 回传表名