Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2025-12-02 3af68ab1bdc20ead38c1521e7b48f32ca6aa2945

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -142,7 +142,8 @@
    @GetMapping(value = "/keyPersonnelSituation")
    public R<List<TLargeKeyPersonnelType>> keyPersonnelSituation() {
        List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list();
        List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list();
        List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 1));
        for (TLargeKeyPersonnelType largeKeyPersonnelType : list) {
            if(largeKeyPersonnelType.getShowType() == 2 && !CollectionUtils.isEmpty(largeKeyGridUsers)){
                // 查询真实的汇总数据

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.export.THelpNeedsExport;
import com.ruoyi.system.export.TMicroWishExport;
import com.ruoyi.system.model.TAppUser;
@@ -49,6 +50,8 @@
public class THelpNeedsController {
    @Autowired
    private THelpNeedsService helpNeedsService;
    @Autowired
    private TokenService tokenService;
    @ApiOperation(value = "助需管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<THelpNeeds>> pageList(@RequestBody HelpNeedsListQuery query) {
@@ -60,6 +63,8 @@
    @Log(title = "助需管理-添加", businessType = BusinessType.INSERT)
    @PostMapping(value = "/add")
    public R<Boolean> save(@RequestBody THelpNeeds dto) {
        String nickName = tokenService.getLoginUser().getUser().getNickName();
        dto.setNickName(nickName);
        helpNeedsService.save(dto);
        return R.ok();
    }

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java

@@ -104,7 +104,11 @@
    public R<?> addMicroWish(@RequestBody TMicroWish dto) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        dto.setAppUserId(userId);
        dto.setStatus(1);
        if(dto.getWishType() == 1){
            dto.setStatus(1);
        }else {
            dto.setStatus(4);
        }
        tMicroWishService.save(dto);
        return R.ok();
    }

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java

@@ -85,7 +85,11 @@
    public R<Page<TCourseOrder>> getCourseOrderList(@RequestBody CourseOrderListQuery query) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TCourseOrder> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery().eq(TCourseOrder::getAppUserId, userId).eq(Objects.nonNull(query.getPayStatus()),TCourseOrder::getPayStatus, query.getPayStatus()).orderByDesc(TCourseOrder::getCreateTime));
        Page<TCourseOrder> courseOrderPage = courseOrderService.page(page, Wrappers.<TCourseOrder>lambdaQuery()
                .eq(TCourseOrder::getAppUserId, userId)
                .ne(TCourseOrder::getPayStatus, 4)
                .eq(Objects.nonNull(query.getPayStatus()),TCourseOrder::getPayStatus, query.getPayStatus())
                .orderByDesc(TCourseOrder::getCreateTime));
        List<TCourseOrder> records = courseOrderPage.getRecords();
        if(!records.isEmpty()){
            List<String> courseIds = records.stream().map(TCourseOrder::getCourseId).collect(Collectors.toList());
@@ -133,23 +137,21 @@
        courseOrder.setOrderNumber(OrderNos.getDid());
        boolean save = courseOrderService.save(courseOrder);
        if (save) {
            Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
            return R.ok(result);
            Map<String, ? extends Object> maps =
                    new ImmutableMap.Builder<String, String>().
                            put("id", courseOrder.getId())
                            .build();
            QuartzManager.addJob(
                    OrderJob.class,
                    (OrderJob.name+courseOrder.getId()).toUpperCase(),
                    TimeJobType.CANCEL_ORDER,
                    DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
                    maps
            );
//            Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
//            return R.ok(result);
            return R.ok();
        }

        Map<String, ? extends Object> maps =
                new ImmutableMap.Builder<String, String>().
                        put("id", courseOrder.getId())
                        .build();
        QuartzManager.addJob(
                OrderJob.class,
                (OrderJob.name+courseOrder.getId()).toUpperCase(),
                TimeJobType.CANCEL_ORDER,
                DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(15)),
                maps
        );


        return R.fail("报名失败");
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

@@ -60,6 +60,8 @@
    @GetMapping(value = "/getNoticeDetail/{id}")
    public R<TNotice> getNoticeDetail(@PathVariable String id) {
        TNotice notice = tNoticeService.getById(id);
        notice.setReadCount(notice.getReadCount() + 1);
        tNoticeService.updateById(notice);
        return R.ok(notice);
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PensionController.java

@@ -65,6 +65,8 @@
    @ApiOperation(value = "养老服务--添加助需")
    public R<String> addHelpNeeds(@RequestBody THelpNeeds tHelpNeeds) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        String nickName = tokenService.getLoginUserApplet().getUser().getNickName();
        tHelpNeeds.setNickName(nickName);
        tHelpNeeds.setAppUserId(userId);
        boolean save = tHelpNeedsService.save(tHelpNeeds);
        if (save) {

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java

@@ -70,7 +70,7 @@

    @ApiOperation(value = "个人中心--托育服务记录详情",response = TChildcareServices.class)
    @GetMapping(value = "/getChildcareServicesDetail/{id}")
    public R<TChildcareServices> getChildcareServicesList(@PathVariable String id) {
    public R<TChildcareServices> getChildcareServicesDetail(@PathVariable String id) {
        TChildcareServices childcareServices = tChildcareServicesService.getById(id);
        return R.ok(childcareServices);
    }
@@ -109,7 +109,10 @@
    public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishStatusQuery query) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
        Page<TMicroWish> microWishPage = tMicroWishService.page(page, Wrappers.<TMicroWish>lambdaQuery().eq(TMicroWish::getAppUserId, userId).eq(Objects.nonNull(query.getStatus()), TMicroWish::getStatus, query.getStatus()).orderByDesc(BaseModel::getCreateTime));
        Page<TMicroWish> microWishPage = tMicroWishService.page(page, Wrappers.<TMicroWish>lambdaQuery()
                .eq(TMicroWish::getAppUserId, userId)
                .eq(Objects.nonNull(query.getStatus()), TMicroWish::getStatus, query.getStatus())
                .orderByDesc(BaseModel::getCreateTime));
        return R.ok(microWishPage);
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java

@@ -50,10 +50,8 @@
        //  获取登录信息
//        String userName = SecurityUtils.getUsernameApplet();
//        if (StringUtils.isNotBlank(userName)){
//            this.setFieldValByName("createBy", userName, metaObject);
//            this.setFieldValByName("updateBy", userName, metaObject);
//        } else {
//            this.setFieldValByName("createBy", userName, metaObject);
//            this.setFieldValByName("updateBy", userName, metaObject);
//        }


 ruoyi-applet/src/main/resources/application-test.yml

@@ -73,7 +73,7 @@
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    database: 1
    # 密码
    password: 123456
    # 连接超时时间

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCourseOrder.java

@@ -72,8 +72,7 @@
    @TableField("id_card")
    private String idCard;

    @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款  4=已取消  5=已完成 6退款中" +
            "")
    @ApiModelProperty(value = "支付状态 1=待支付 2=已支付 3=已退款  4=已取消  5=已完成 6退款中")
    @TableField("pay_status")
    private Integer payStatus;


 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeKeyGridUser.java

@@ -65,12 +65,12 @@
    @TableField("user_sex")
    private Integer userSex;

    @Pattern(regexp = "^$|(^[1-9]\\\\d{7}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])\\\\d{3}$)|(^[1-9]\\\\d{5}[1-9]\\\\d{3}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])((\\\\d{4})|\\\\d{3}[Xx])$)",message = "身份证号格式不正确")
//    @Pattern(regexp = "^$|(^[1-9]\\\\d{7}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])\\\\d{3}$)|(^[1-9]\\\\d{5}[1-9]\\\\d{3}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])((\\\\d{4})|\\\\d{3}[Xx])$)",message = "身份证号格式不正确")
    @ApiModelProperty(value = "身份证号")
    @TableField("id_card")
    private String idCard;

    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeKeyPersonnelType.java

@@ -39,7 +39,7 @@
    @TableField("show_type")
    private Integer showType;

    @Length(max = 11,message = "显示数量不能超过11个字符")
//    @Length(max = 11,message = "显示数量不能超过11个字符")
    @ApiModelProperty(value = "显示数量")
    @TableField("show_number")
    private Integer showNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeOrganization.java

@@ -45,7 +45,7 @@
    @TableField("address")
    private String address;

    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeResource.java

@@ -62,7 +62,7 @@
    @TableField("contact_person")
    private String contactPerson;

    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeSocialWorker.java

@@ -57,7 +57,7 @@
    @TableField("political_status")
    private String politicalStatus;

    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeUser.java

@@ -45,7 +45,7 @@
    @TableField("user_name")
    private String userName;

    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "手机号")
    @TableField("user_phone")
    private String userPhone;

 ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml

@@ -33,6 +33,7 @@
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and t1.create_time between #{query.startTime} and #{query.endTime}
        </if>
        order by t1.create_time desc
    </select>
    <select id="exportHelpNeeds" resultType="com.ruoyi.system.export.THelpNeedsExport">
        select t1.* from t_help_needs t1
@@ -46,6 +47,7 @@
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and t1.create_time between #{query.startTime} and #{query.endTime}
        </if>
        order by t1.create_time desc
    </select>

</mapper>