Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -428,26 +428,28 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             appUserPositionTempDTO.setPositionId(6);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
-        if (Objects.nonNull(appUserPositionTempDTO.getUserId())) {
+        if (Objects.nonNull(appUserPositionTempDTO.getUserId()) && !Objects.equals(0,appUserPositionTempDTO.getUserId())) {
             if (StaffChangeStatusEnum.needChangePostionsStatus.contains(changeStatus)) {
                 //用户表更改其身份
                 AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-                //1.查询股东表 根据userid 或 手机号
-                Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
-                //离职
-                if (StaffChangeStatusEnum.JOB_SEPARATION.getCode() == changeStatus) {
-                    if (Objects.isNull(postionId)) {
-                        //更改为普通用户 6
-                        loginBiz.updateUserPosition(appUserDetail.getUserid(), 6);
+                if(Objects.nonNull(appUserDetail) && Objects.nonNull(appUserDetail.getUserid())) {
+                    //1.查询股东表 根据userid 或 手机号
+                    Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
+                    //离职
+                    if (StaffChangeStatusEnum.JOB_SEPARATION.getCode() == changeStatus) {
+                        if (Objects.isNull(postionId)) {
+                            //更改为普通用户 6
+                            loginBiz.updateUserPosition(appUserDetail.getUserid(), 6);
+                        }
                     }
-                }
-                //身份变更
-                if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                    //不是离职状态下
-                    if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
-                        postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
-                        //更改为股东身份
-                        loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                    //身份变更
+                    if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
+                        //不是离职状态下
+                        if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
+                            postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                            //更改为股东身份
+                            loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                        }
                     }
                 }
             }
@@ -471,7 +473,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         //用户表更改其身份
         if (Objects.nonNull(appUserPositionTempDTO.getUserId())) {
             AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
-            if (appUserDetail != null) {
+            if (appUserDetail != null && Objects.nonNull(appUserDetail.getUserid())) {
                 Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
                 postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
                 loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderProfileDispayVo.java

@@ -64,6 +64,6 @@ public class OrderProfileDispayVo implements Serializable {
     }
 
     public BigDecimal getOrderAmount() {
-        return CollectionUtils.isEmpty(orderProfiles)?BigDecimal.ZERO:orderProfiles.stream().map(OrderProfileVo::getOrderAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
+        return CollectionUtils.isEmpty(orderProfiles)?BigDecimal.ZERO:orderAmount;
     }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderProfileDisplayBiz.java

@@ -89,7 +89,8 @@ public class OrderProfileDisplayBiz extends BaseBiz<OrderProfileDisplayMapper, O
         //2.1查询订单数据
         List<BaseOrderDTO> baseOrders = baseOrderBiz.findOrdersByDate(startDate, endDate);
         //2.2查询固定数据
-        List<OrderProfileDisplay> orderProfileDisplays = findOrderProfileDisplayDataByDate(startDate, endDate);
+        Date constantEndDate = DateUtil.offsetDay(endDate, -1).toJdkDate();
+        List<OrderProfileDisplay> orderProfileDisplays = findOrderProfileDisplayDataByDate(startDate, constantEndDate);
 
         CountDownLatch latch = new CountDownLatch(3);
         //3. 十大运营中心订单数据
@@ -155,8 +156,9 @@ public class OrderProfileDisplayBiz extends BaseBiz<OrderProfileDisplayMapper, O
         //2.支付终端统计
         wrapToPayProfileWithPayTerminal(baseOrders, orderAmountConstant, largeScreenDisplayConstantDataBo, orderPayProfileDispalyVo);
 
+        BigDecimal realOrderAmount = baseOrders.stream().map(BaseOrderDTO::getRealAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         //累计订单金额
-        orderProfileDispayVo.setOrderAmount(orderAmountConstant);
+        orderProfileDispayVo.setOrderAmount(orderAmountConstant.add(realOrderAmount));
         orderProfileDispayVo.setOrderPayProfileDisplay(orderPayProfileDispalyVo);
         return orderProfileDispayVo;
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/CompanyOrderReceivedStatiscsAdminController.java

@@ -53,6 +53,8 @@ public class CompanyOrderReceivedStatiscsAdminController {
       public void exportCompanyPerformance(@RequestBody CompanyPerformanceFindDTO companyPerformanceFindDTO, HttpServletResponse response){
 
           try {
+              companyPerformanceFindDTO.setLimit(null);
+              companyPerformanceFindDTO.setPage(null);
               String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
               response.setContentType("application/vnd.ms-excel;charset=utf-8");
               String filename = String.format("%s-company-statistics.xlsx",name);