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

pz-applet/src/main/java/com/pz/applet/AppletOrderMessageController.java

 package com.pz.applet;
 package com.pz.applet;
 
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import com.pz.applet.util.CityIdUtils;
 import com.pz.applet.util.CityIdUtils;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
 import com.pz.system.domain.vo.AppletOrderMessageVo;
 import com.pz.system.domain.vo.AppletOrderMessageVo;
@@ -23,7 +22,6 @@ import java.util.List;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @RestController
 @RestController
 @RequestMapping("/applet/orderMessage")
 @RequestMapping("/applet/orderMessage")
-@SaIgnore
 public class AppletOrderMessageController {
 public class AppletOrderMessageController {
 
 
     private final IOrderMessageService iOrderMessageService;
     private final IOrderMessageService iOrderMessageService;

pz-merchant/src/main/java/com/pz/merchant/controller/pc/CompanyController.java

@@ -54,7 +54,7 @@ public class CompanyController extends BaseController {
         if(null != roleId && roleId == 3){
         if(null != roleId && roleId == 3){
             bo.setUid(getUserId().intValue());
             bo.setUid(getUserId().intValue());
         }
         }
-        bo.setStatus(1);
+        //bo.setStatus(1);
         return R.ok(iCompanyService.queryListP(bo));
         return R.ok(iCompanyService.queryListP(bo));
     }
     }
 
 

pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java

@@ -22,12 +22,15 @@ import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.service.ICompanyService;
 import com.pz.merchant.service.ICompanyService;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.domain.Income;
 import com.pz.system.domain.Income;
+import com.pz.system.domain.SysUserRole;
 import com.pz.system.domain.bo.DataViewBo;
 import com.pz.system.domain.bo.DataViewBo;
 import com.pz.system.domain.bo.WithdrawDepositBo;
 import com.pz.system.domain.bo.WithdrawDepositBo;
 import com.pz.system.domain.vo.DataViewVo;
 import com.pz.system.domain.vo.DataViewVo;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.IncomeMapper;
 import com.pz.system.mapper.IncomeMapper;
 import com.pz.system.mapper.SysUserMapper;
 import com.pz.system.mapper.SysUserMapper;
+import com.pz.system.mapper.SysUserRoleMapper;
+import com.pz.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -57,6 +60,10 @@ public class CompanyServiceImpl implements ICompanyService {
 
 
     private final SysUserMapper sysUserMapper;
     private final SysUserMapper sysUserMapper;
 
 
+    private final ISysUserService iSysUserService;
+
+    private final SysUserRoleMapper userRoleMapper;
+
     /**
     /**
      * 查询商户
      * 查询商户
      */
      */
@@ -142,9 +149,15 @@ public class CompanyServiceImpl implements ICompanyService {
         if(update.getStatus() == 0 || update.getStatus() == 2){
         if(update.getStatus() == 0 || update.getStatus() == 2){
             sysUser.setUserType(UserType.XCX_USER.getUserType());
             sysUser.setUserType(UserType.XCX_USER.getUserType());
             sysUserMapper.updateById(sysUser);
             sysUserMapper.updateById(sysUser);
+            userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
         }else if(update.getStatus() == 1){
         }else if(update.getStatus() == 1){
             sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
             sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
             sysUserMapper.updateById(sysUser);
             sysUserMapper.updateById(sysUser);
+            // 新增用户与角色管理
+            SysUserRole ur = new SysUserRole();
+            ur.setUserId(sysUser.getUserId());
+            ur.setRoleId(3L);
+            userRoleMapper.insert(ur);
         }
         }
         return baseMapper.updateById(update) > 0;
         return baseMapper.updateById(update) > 0;
     }
     }

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

@@ -24,6 +24,7 @@
         from order_message
         from order_message
                  join total_order on total_order.id = order_message.total_order_id
                  join total_order on total_order.id = order_message.total_order_id
                  left join sys_user as user on user.user_id = total_order.uid
                  left join sys_user as user on user.user_id = total_order.uid
+        where order_message.city_id = #{city}
         order by order_message.id desc
         order by order_message.id desc
         limit 10
         limit 10
     </select>
     </select>