Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 2fcf3c67e95c1b7c82a1c8ba1cf308ffed0a47b1

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

@@ -92,7 +92,7 @@
            return isAddStore;
        }
        R isAddSysUser = userService.addSysUser(storeVO);
        if(isAddStore.getCode() != 200){
        if(isAddSysUser.getCode() != 200){
            return isAddSysUser;
        }
        return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java

@@ -1,12 +1,15 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +19,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -30,6 +34,9 @@
public class HouseApi extends BaseController {
    @Resource
    private CommunityService communityService;

    @Resource
    private UserService userService;

    @ApiOperation(value = "房屋租售-新增")
    @PostMapping("house")
@@ -56,7 +63,24 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("房屋租售id主键不能为空");
        }
        return communityService.putOpsHouse(comOpsHouseVO);
        R r =  communityService.putOpsHouse(comOpsHouseVO);
        if(R.isOk(r) && 1==comOpsHouseVO.getStatus()) {
            //审核通过添加提示信息
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(comOpsHouseVO.getUserId());
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("房源审核通过");
            sysUserNoticeVO.setBusinessType(1);
            sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经审核通过");
            sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId());
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(2);
            R r2 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r2)) {
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }
        return r;
    }

    @ApiOperation(value = "房屋租售-删除")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -73,7 +73,7 @@
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
            "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
            "AND w.status  in (3,6) \n" +
            "AND w.status  in (3, 5, 6) \n" +
            " </if> " +
            "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
            "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java

@@ -59,7 +59,8 @@
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMicroWishVO1 -> {
                Long id = comActMicroWishVO1.getId();
                ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id).eq(ComActMicroWishUserDO::getUserId, userId));
                ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
                        .eq(ComActMicroWishUserDO::getUserId, userId));
                if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
                    comActMicroWishVO1.setHaveGiveThumbsUp(0);
                } else {

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1652,12 +1652,12 @@
            if (e.getMessage().contains("union_phone_type")) {
                userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
                roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
                throw new ServiceException("手机号已经存在");
                return R.fail("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
                return R.fail("账户已经存在");
            }
        }
        return R.fail();
        return R.ok();
    }

    /**