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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -134,7 +134,7 @@ public class OrderLogLogic {
             noticeRecord.setNoticeId(pgOrderWorker.getOrderBaseId());
             noticeRecord.setTitle("服务单派工");
             noticeRecord.setContent("服务单号："+pgOrderWorker.getOrderBaseId()+",网点名称："+pgOrderBase.getWebsitName()
-                    +"，预约时间："+DateUtil.format(pgOrderBase.getAppointmentTime(),"yyyy-MM-dd")+",服务项目："+text+",客户信息："+pgOrderBase.getUserName()+
+                    +"，预约时间："+(pgOrderBase.getAppointmentTime() != null?DateUtil.format(pgOrderBase.getAppointmentTime(),"yyyy-MM-dd"):"")+",服务项目："+text+",客户信息："+pgOrderBase.getUserName()+
                     ",客户电话："+pgOrderBase.getUserMobile()+",服务地址："+pgOrderBase.getAddress());
             noticeRecord.setType(NoticeEnum.B.getKey());
             noticeRecord.setIsNotice(IsYesNoEnum.YES.getKey());

mall-server-api/src/main/java/com/gree/mall/manager/logic/charging/ChargingStandardLogic.java

@@ -73,6 +73,7 @@ public class ChargingStandardLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         return chargingStandardTypeService.lambdaQuery()
                 .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()),ChargingStandardType::getCompanyWechatId,adminUser.getCompanyWechatId())
+                .eq(ChargingStandardType::getStatus,true)
                 .orderByAsc(ChargingStandardType::getSortNum)
                 //.orderByDesc(ChargingStandardType::getCreateTime)
                 .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -202,7 +202,12 @@ public class CommonLogic {
                 adminUserCom.setAdminWebsitIds(collect);
             }
 
-            adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
+            List<String> ids = new ArrayList<>();
+            if (adminCompanyWechat != null) {
+                ids.add(adminCompanyWechat.getCompanyWechatId());
+                adminUserCom.setCompanyWechatIds(ids);
+                adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
+            }
         }
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -513,7 +513,7 @@ public class CountLogic {
 
 
         List<WebsitVender> websitVenders = websitVenderService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitVender::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitVender::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .select(WebsitVender::getStatus, WebsitVender::getVenderId).list();
 
         materialCount.setAllVendNum(

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -251,7 +251,7 @@ public class OrderLogLogic {
             noticeRecord.setNoticeId(pgOrderWorker.getOrderBaseId());
             noticeRecord.setTitle("服务单派工");
             noticeRecord.setContent("服务单号："+pgOrderWorker.getOrderBaseId()+",网点名称："+pgOrderBase.getWebsitName()
-            +"，预约时间："+DateUtil.format(pgOrderBase.getAppointmentTime(),"yyyy-MM-dd")+",服务项目："+text+",客户信息："+pgOrderBase.getUserName()+
+            +"，预约时间："+(pgOrderBase.getAppointmentTime() != null?DateUtil.format(pgOrderBase.getAppointmentTime(),"yyyy-MM-dd"):"")+",服务项目："+text+",客户信息："+pgOrderBase.getUserName()+
                     ",客户电话："+pgOrderBase.getUserMobile()+",服务地址："+pgOrderBase.getAddress());
             noticeRecord.setType(NoticeEnum.B.getKey());
             noticeRecord.setIsNotice(IsYesNoEnum.YES.getKey());