统计问题修改

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/MallPortalApplication.java

@@ -11,15 +11,15 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@MapperScan({ "com.yonge.cooleshow.portal.dao", "com.yonge.toolset.payment.core.dao", "com.yonge.cooleshow.mbg.mapper"})
-@ComponentScan(basePackages = {"com.yonge.cooleshow.portal","com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common", "com.yonge.cooleshow.common","com.yonge.toolset.payment","com.yonge.toolset.log"})
+@MapperScan({"com.yonge.cooleshow.portal.dao", "com.yonge.toolset.payment.core.dao", "com.yonge.cooleshow.mbg.mapper"})
+@ComponentScan(basePackages = {"com.yonge.cooleshow.portal", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common", "com.yonge.cooleshow.common", "com.yonge.toolset.payment", "com.yonge.toolset.log"})
 @EnableSwagger2Doc
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
 public class MallPortalApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(MallPortalApplication.class, args);
+        BaseApplication.run(AppConstant.APPLICATION_MALL_PORTAL, MallPortalApplication.class, args);
     }
 
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PlatformCashAccountRecordController.java

@@ -70,8 +70,8 @@ public class PlatformCashAccountRecordController extends BaseController {
 			}
 			list.add(export);
 		});
-		ExcelUtils.exportExcel(list, "老师收入列表数据" + System.currentTimeMillis(),
-				"老师收入列表数据");
+		ExcelUtils.exportExcel(list, "平台收支列表数据" + System.currentTimeMillis(),
+				"平台收支列表数据");
 	}
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -295,7 +295,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
             info.setVideoShareAmount(null == info.getVideoShareAmount() ? BigDecimal.ZERO : info.getVipShareAmount());
             info.setMusicShareAmount(null == info.getMusicShareAmount() ? BigDecimal.ZERO : info.getMusicShareAmount());
             info.setVipShareAmount(null == info.getVipShareAmount() ? BigDecimal.ZERO : info.getVipShareAmount());
-            info.setMallShareAmount(null == info.getMusicShareAmount() ? BigDecimal.ZERO : info.getMusicShareAmount());
+            info.setMallShareAmount(null == info.getMusicShareAmount() ? BigDecimal.ZERO : info.getMallShareAmount());
 
             practiceAmount = practiceAmount.add(info.getPracticeAmount());
             liveAmount = liveAmount.add(info.getLiveAmount());