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

@@ -696,7 +696,7 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 SELECT
                 	SUM(amount) as amount,
                 	SUM(real_amount) as real_amount,
-                	SUM(back_money) / 100 as back_money
+                	SUM(back_money) as back_money
                 FROM (
                 	SELECT
                 		a.id, -- 主键id

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

@@ -288,23 +288,31 @@ public class RoleManageServiceImpl implements IRoleManageService {
 
         //投手名
         if (dataMap.get("put_user_id") != null) {
-            dataMap.put("put_user_name",
-                    sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData().getNickname());
+            if (sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData() != null) {
+                dataMap.put("put_user_name",
+                        sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData().getNickname());
+            }
         }
         //运营人员名
         if (dataMap.get("oper_user_id") != null) {
-            dataMap.put("oper_user_name",
-                    sysUserRpc.getById((Long) dataMap.get("oper_user_id")).getData().getNickname());
+            if (sysUserRpc.getById((Long) dataMap.get("oper_user_id")).getData() != null) {
+                dataMap.put("oper_user_name",
+                        sysUserRpc.getById((Long) dataMap.get("oper_user_id")).getData().getNickname());
+            }
         }
         //GS人员名
         if (dataMap.get("gs_id") != null) {
-            dataMap.put("gs_name",
-                    sysUserRpc.getById((Long) dataMap.get("gs_id")).getData().getNickname());
+            if (sysUserRpc.getById((Long) dataMap.get("gs_id")).getData() != null) {
+                dataMap.put("gs_name",
+                        sysUserRpc.getById((Long) dataMap.get("gs_id")).getData().getNickname());
+            }
         }
         //客服人员名
         if (dataMap.get("customer_service_id") != null) {
-            dataMap.put("customer_service_name",
-                    sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
+            if (sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData() != null) {
+                dataMap.put("customer_service_name",
+                        sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
+            }
         }
 
         return dataMap;