lidongdong
2023-10-31 89e2624233691259499b54c13d5ee22846e0871b
新增查询未绑定网格接口
2个文件已修改
22 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
@@ -1,16 +1,11 @@
package com.panzhihua.common.model.vos.community.convenient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.enums.MerchantBusinessPeriod;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
 * @title: ConvenientMerchantVO
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -130,10 +130,25 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password,this.getAppId());
        R r = tokenService.loginXQDP(account, password,"wx0cef797390444b75");
        return r;
    }
    @ApiOperation(value = "花城大屏登录", response = LoginReturnVO.class)
    @PostMapping("xq/login")
    public R hcdpLogin(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password,"wx118de8a734d269f0");
        return r;
    }
    @ApiOperation(value = "电动车商城商家后台登录", response = LoginReturnVO.class)
    @PostMapping("battery/login")
    public R batteryLogin(@RequestBody LoginBody loginBody) {