1.调整

propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiLoginController.java

@@ -147,4 +147,20 @@ public class ApiLoginController {
         return R.ok(loginWxUser);
     }
 
+    /**
+     * 用户性别修改
+     * @return OK
+     */
+    @PostMapping("/updateUserSex/{sex}")
+    public R<LoginWxUser> updateUserSex(@PathVariable @NotNull(message = "性别不能为空") Integer sex) {
+        LoginWxUser wxUser = AuthUtil.getWxUser();
+        WxUser user = userMapper.selectById(AuthUtil.getWxUser().getId());
+        user.setSex(sex);
+        userMapper.updateById(user);
+        BeanUtil.copyProperties(user, wxUser);
+        wxUserTokenService.refreshToken(wxUser);
+        LoginWxUser loginWxUser = RedisUtils.getCacheObject(CacheConstants.LOGIN_MERCHANT_TOKEN_KEY + wxUser.getToken());
+        return R.ok(loginWxUser);
+    }
+
 }

propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCommunityController.java

@@ -89,6 +89,7 @@ public class ApiWxCommunityController extends BaseController {
         wxUser.setProprietorId(proprietorId);
         wxUser.setRoom(proprietorLedger.getRoom());
         wxUser.setName(proprietorLedger.getName());
+        wxUser.setIdentityCard(proprietorLedger.getIdentityCard());
         wxUser.setSqm(proprietorLedger.getSqm());
         wxUser.setMonthMoney(proprietorLedger.getMonthMoney());
         /**

propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxLiveBillController.java

@@ -8,6 +8,7 @@ import com.propertyManagement.business.support.util.AuthUtil;
 import com.propertyManagement.common.core.controller.BaseController;
 import com.propertyManagement.common.core.domain.R;
 import com.propertyManagement.common.core.validate.AddGroup;
+import com.propertyManagement.common.enums.LiveBillCreateType;
 import com.propertyManagement.common.enums.LiveBillState;
 import com.propertyManagement.common.enums.LiveBillType;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -35,7 +37,7 @@ public class ApiWxLiveBillController extends BaseController {
      * 查询待缴账单列表
      */
     @GetMapping("/listAll")
-    public R<List<WxLiveBillVo>> listAll(@NotEmpty(message = "类型不能为空") Integer type, Long carportId) {
+    public R<List<WxLiveBillVo>> listAll(@NotNull(message = "类型不能为空") Integer type, Long carportId) {
         LoginWxUser wxUser = AuthUtil.getWxUser();
         WxLiveBillBo wxLiveBillBo = new WxLiveBillBo();
         wxLiveBillBo.setProprietorId(wxUser.getProprietorId());
@@ -48,6 +50,7 @@ public class ApiWxLiveBillController extends BaseController {
             }
         }
         wxLiveBillBo.setType(type);
+        wxLiveBillBo.setCreateType(LiveBillCreateType.TWO.getCode());
         return R.ok(iWxLiveBillService.queryList(wxLiveBillBo));
     }
 

propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxRepairsController.java

@@ -55,6 +55,14 @@ public class ApiWxRepairsController extends BaseController {
         return R.ok(iWxRepairsService.countAll());
     }
 
+    /**
+     * 查询维修人员报修状态统计
+     */
+    @GetMapping("/maintainCountAll")
+    public R<Map<Integer, Long>> maintainCountAll() {
+        return R.ok(iWxRepairsService.maintainCountAll());
+    }
+
     /**
      * 查询维修报修列表
      */
@@ -126,6 +134,7 @@ public class ApiWxRepairsController extends BaseController {
         }
         WxRepairsBo repairsBo = BeanUtil.toBean(repairsVo, WxRepairsBo.class);
         repairsBo.setState(RepairsState.TWO.getCode());
+        repairsBo.setMoney(money);
         return toAjax(iWxRepairsService.updateByBo(repairsBo));
     }
 }

propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxCarportBo.java

@@ -70,7 +70,6 @@ public class WxCarportBo extends BaseEntity {
     /**
      * 车型
      */
-    @NotBlank(message = "车型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String vehicleModel;
 
     /**

propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxFamilyMemberBo.java

@@ -34,7 +34,6 @@ public class WxFamilyMemberBo extends BaseEntity {
     /**
      * 业主ID
      */
-    @NotNull(message = "业主不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long proprietorId;
 
     /**
@@ -70,7 +69,6 @@ public class WxFamilyMemberBo extends BaseEntity {
     /**
      * 电话
      */
-    @NotBlank(message = "电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String phone;
 
     /**

propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java

@@ -72,7 +72,6 @@ public class WxGuestBo extends BaseEntity {
     /**
      * 车牌号
      */
-    @NotBlank(message = "车牌号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String plateNumber;
 
     /**

propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/LoginWxUser.java

@@ -35,6 +35,9 @@ public class LoginWxUser implements Serializable {
     /** 业主名称 */
     private String name;
 
+    /** 身份证号 */
+    private String identityCard;
+
     /** 小区ID */
     private Long communityId;
 

propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxPayRecordVo.java

@@ -3,6 +3,8 @@ package com.propertyManagement.business.domain.vo;
 import java.math.BigDecimal;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.propertyManagement.common.annotation.ExcelDictFormat;
 import com.propertyManagement.common.convert.ExcelDictConvert;
 import com.propertyManagement.common.core.validate.AddGroup;
@@ -122,5 +124,11 @@ public class WxPayRecordVo implements Serializable {
     @ExcelProperty(value = "平台支付流水号")
     private String outTradeNo;
 
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
 
 }

propertyManagement-business/src/main/java/com/propertyManagement/business/service/IWxRepairsService.java

@@ -38,6 +38,11 @@ public interface IWxRepairsService {
      */
     Map<Integer, Long> countAll();
 
+    /**
+     * 查询用户报修状态统计
+     */
+    Map<Integer, Long> maintainCountAll();
+
     /**
      * 小程序新增报修
      */

propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java

@@ -8,11 +8,13 @@ import com.propertyManagement.business.domain.WxFamilyMember;
 import com.propertyManagement.business.domain.WxProprietorLedger;
 import com.propertyManagement.business.domain.WxUserCommunityLedger;
 import com.propertyManagement.business.domain.bo.WxFamilyMemberBo;
+import com.propertyManagement.business.domain.vo.LoginWxUser;
 import com.propertyManagement.business.domain.vo.WxFamilyMemberVo;
 import com.propertyManagement.business.mapper.WxFamilyMemberMapper;
 import com.propertyManagement.business.mapper.WxProprietorLedgerMapper;
 import com.propertyManagement.business.mapper.WxUserCommunityLedgerMapper;
 import com.propertyManagement.business.service.IWxFamilyMemberService;
+import com.propertyManagement.business.support.util.AuthUtil;
 import com.propertyManagement.common.core.domain.PageQuery;
 import com.propertyManagement.common.core.page.TableDataInfo;
 import com.propertyManagement.common.utils.StringUtils;
@@ -106,7 +108,7 @@ public class WxFamilyMemberServiceImpl implements IWxFamilyMemberService {
     public Boolean updateByBo(WxFamilyMemberBo bo) {
         WxFamilyMember update = BeanUtil.toBean(bo, WxFamilyMember.class);
         validEntityBeforeSave(update);
-        WxProprietorLedger proprietorLedger = proprietorLedgerMapper.selectById(bo.getProprietorId());
+        WxProprietorLedger proprietorLedger = proprietorLedgerMapper.selectById(AuthUtil.getWxUser().getProprietorId());
         update.setProprietorId(proprietorLedger.getProprietorId());
         update.setProprietorName(proprietorLedger.getName());
         update.setCommunityId(proprietorLedger.getCommunityId());

propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java

@@ -77,6 +77,7 @@ public class WxLiveBillServiceImpl implements IWxLiveBillService {
         lqw.eq(bo.getType() != null, WxLiveBill::getType, bo.getType());
         lqw.eq(bo.getState() != null, WxLiveBill::getState, bo.getState());
         lqw.eq(bo.getCarportId() != null, WxLiveBill::getCarportId, bo.getCarportId());
+        lqw.eq(bo.getCreateType() != null, WxLiveBill::getCreateType, bo.getCreateType());
         lqw.orderByDesc(WxLiveBill::getCreateTime);
         return lqw;
     }

propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java

@@ -101,6 +101,26 @@ public class WxRepairsServiceImpl implements IWxRepairsService {
         return map;
     }
 
+    /**
+     * 查询用户报修状态统计
+     */
+    @Override
+    public Map<Integer, Long> maintainCountAll() {
+        Map<Integer, Long> map = new LinkedHashMap<>();
+        LoginWxUser wxUser = AuthUtil.getWxUser();
+        LambdaQueryWrapper<WxRepairs> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper
+            .eq(WxRepairs::getAccountId, wxUser.getAccountId())
+            .eq(WxRepairs::getState, RepairsState.ONE.getCode());
+        map.put(RepairsState.ONE.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
+        lambdaQueryWrapper.clear();
+        lambdaQueryWrapper
+            .eq(WxRepairs::getAccountId, wxUser.getAccountId())
+            .eq(WxRepairs::getState, RepairsState.THREE.getCode());
+        map.put(RepairsState.THREE.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
+        return map;
+    }
+
 
     private LambdaQueryWrapper<WxRepairs> buildQueryWrapper(WxRepairsBo bo) {
         Map<String, Object> params = bo.getParams();