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

pz-admin/src/main/java/com/pz/web/controller/system/SysLoginController.java

@@ -26,6 +26,7 @@ import javax.validation.constraints.NotBlank;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Optional;
 
 
 /**
 /**
  * 登录验证
  * 登录验证
@@ -110,7 +111,10 @@ public class SysLoginController {
     public R<Map<String, Object>> getInfo() {
     public R<Map<String, Object>> getInfo() {
         LoginUser loginUser = LoginHelper.getLoginUser();
         LoginUser loginUser = LoginHelper.getLoginUser();
         SysUser user = userService.selectUserById(loginUser.getUserId());
         SysUser user = userService.selectUserById(loginUser.getUserId());
-        user.setRoleId(iSysRoleService.getRoleByUserId(user.getUserId()).getRoleId());
+        Optional.ofNullable(iSysRoleService.getRoleByUserId(user.getUserId()))
+            .ifPresent(sysRole -> {
+                user.setRoleId(sysRole.getRoleId());
+            });
         Map<String, Object> ajax = new HashMap<>();
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("user", user);
         ajax.put("roles", loginUser.getRolePermission());
         ajax.put("roles", loginUser.getRolePermission());

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -36,6 +36,8 @@ import com.pz.merchant.domain.WechatUserInfo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.service.ICompanyService;
 import com.pz.merchant.service.ICompanyService;
+import com.pz.system.domain.StoreApply;
+import com.pz.system.mapper.StoreApplyMapper;
 import com.pz.system.mapper.SysUserMapper;
 import com.pz.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +68,7 @@ public class SysLoginService {
     private final SysPermissionService permissionService;
     private final SysPermissionService permissionService;
     private final CompanyMapper companyMapper;
     private final CompanyMapper companyMapper;
     private final ISysRoleService iSysRoleService;
     private final ISysRoleService iSysRoleService;
+    private final StoreApplyMapper storeApplyMapper;
 
 
     @Value("${user.password.maxRetryCount}")
     @Value("${user.password.maxRetryCount}")
     private Integer maxRetryCount;
     private Integer maxRetryCount;
@@ -99,6 +102,13 @@ public class SysLoginService {
                     .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
                     .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
             }
             }
         });
         });
+        Optional.ofNullable(role).ifPresent(sysRoles -> {
+            user.setRoleId(role.getRoleId());
+            if (role.getRoleId().equals(5)) {
+                Optional.ofNullable(storeApplyMapper.selectOne(Wrappers.<StoreApply>lambdaQuery().eq(StoreApply::getUid, user.getUserId()).eq(StoreApply::getStatus, 1)))
+                    .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
+            }
+        });
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         LoginUser loginUser = buildLoginUser(user);
         LoginUser loginUser = buildLoginUser(user);
         // 生成token
         // 生成token

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

@@ -71,7 +71,7 @@
         where t.id = #{id}
         where t.id = #{id}
     </select>
     </select>
     <select id="selectSaleroom" resultType="com.pz.system.domain.vo.DataOrderVo">
     <select id="selectSaleroom" resultType="com.pz.system.domain.vo.DataOrderVo">
-        SELECT IFNULL(ROUND(SUM(pay_money), 2),0) as dataSum FROM total_order WHERE `status` = 1 and refund_amount = 0
+        SELECT IFNULL(ROUND(SUM(pay_money), 2),0) as dataSum FROM total_order WHERE `status` != 0 and refund_amount = 0
         <if test="dataViewBo.condition == 2">
         <if test="dataViewBo.condition == 2">
             and finish_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) -- 近7天
             and finish_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) -- 近7天
         </if>
         </if>