api

lb-app/src/main/java/com/ydd/app/controller/DevelopmentApi.java

@@ -6,15 +6,13 @@ import com.ydd.app.service.*;
 import com.ydd.common.annotation.AccessToken;
 import com.ydd.common.core.controller.BaseController;
 import com.ydd.common.core.domain.ResponseResult;
+import com.ydd.module.domain.AppInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -83,4 +81,21 @@ public class DevelopmentApi extends BaseController {
     public ResponseResult appSecretInfo() {
         return apiDevelopService.appSecretInfo(getLoginId());
     }
+
+    @ApiOperation("设置回调地址")
+    @RequestMapping(value = "/set/callback/url", method = RequestMethod.POST)
+    @AccessToken
+    public ResponseResult setCallbackUrl(@RequestBody @Valid AppInfo appInfo) {
+        return apiDevelopService.setCallbackUrl(getLoginId(), appInfo);
+    }
+
+    @ApiOperation("客户列表")
+    @RequestMapping(value = "/customer/list", method = RequestMethod.GET)
+
+    public ResponseResult customers(@RequestParam(required = false, name = "cityName") String cityName,
+                                    @RequestParam(required = false, name = "businessName") String businessName,
+                                    @RequestParam(required = false, name = "contactName") String contactName) {
+        startPage();
+        return apiDevelopService.selectCustomerList(cityName, businessName, contactName);
+    }
 }

lb-app/src/main/java/com/ydd/app/service/ApiDevelopService.java

@@ -3,6 +3,7 @@ package com.ydd.app.service;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.app.dto.*;
 import com.ydd.common.core.domain.ResponseResult;
+import com.ydd.module.domain.AppInfo;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Shop;
 
@@ -51,4 +52,19 @@ public interface ApiDevelopService {
     ResponseResult editMemberPassword(OpenMemberPasswordDto memberPasswordDto);
 
     ResponseResult appSecretInfo(Long loginId);
+
+    /**
+     * 设置回调地址
+     * @return
+     */
+    ResponseResult setCallbackUrl(Long loginId, AppInfo appInfo);
+
+    /**
+     * 大客户列表
+     * @param cityName 城市名称
+     * @param businessName 企业名称
+     * @param contactName 联系人名称
+     * @return
+     */
+    ResponseResult selectCustomerList(String cityName, String businessName, String contactName);
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiDevelopServiceImpl.java

@@ -1,41 +1,26 @@
 package com.ydd.app.service.impl;
 
 import cn.hutool.core.lang.UUID;
-import com.alibaba.fastjson.JSONObject;
-import com.baidu.aip.ocr.AipOcr;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.ydd.api.DeliveryService;
-import com.ydd.app.ShopEditUtils;
-import com.ydd.app.ShopEntityUtils;
 import com.ydd.app.dto.*;
 import com.ydd.app.service.*;
+import com.ydd.module.dto.OpenCustomerDto;
 import com.ydd.app.vo.OpenMemberInfoVo;
 import com.ydd.common.constant.Constants;
 import com.ydd.common.core.domain.ResponseResult;
+import com.ydd.common.core.page.PageResult;
 import com.ydd.common.core.redis.RedisCache;
-import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.enums.ResponseResultCodeEnum;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.common.utils.sign.Md5Utils;
-import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.framework.web.service.TokenService;
 import com.ydd.module.domain.*;
-import com.ydd.module.dto.DeliveryConfigDto;
-import com.ydd.module.dto.StoreDeliveryDto;
 import com.ydd.module.enums.*;
-import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.*;
-import com.ydd.third.common.utils.AddressLngLatExchanger;
-import com.ydd.third.common.utils.CoordinateUtils;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.common.vo.shop.ShopResultVo;
-import com.ydd.third.common.vo.shop.ShopVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.xmlbeans.impl.xb.xsdschema.AppinfoDocument;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import static com.ydd.module.enums.CacheKeyEnum.SMS_REGISTER_CAPTCHA;
 
@@ -238,7 +222,7 @@ public class ApiDevelopServiceImpl implements ApiDevelopService {
     @Override
     public ResponseResult editMemberInfo(OpenMemberInfoDto memberInfoDto) {
         Member member = iMemberService.getMemberByMobile(memberInfoDto.getResistMobile());
-        ResponseResult result = specialJudge(member, memberInfoDto.getResistMobile(), memberInfoDto.getCode());
+        ResponseResult result = memberInfoJudge(member, memberInfoDto.getResistMobile(), memberInfoDto.getCode());
         if (result.getCode() != ResponseResultCodeEnum.SUCCESS.getCode()) {
             return result;
         }
@@ -253,7 +237,7 @@ public class ApiDevelopServiceImpl implements ApiDevelopService {
     @Override
     public ResponseResult editMemberPassword(OpenMemberPasswordDto memberPasswordDto) {
         Member member = iMemberService.getMemberByMobile(memberPasswordDto.getResistMobile());
-        ResponseResult result = specialJudge(member, memberPasswordDto.getResistMobile(), memberPasswordDto.getCode());
+        ResponseResult result = memberInfoJudge(member, memberPasswordDto.getResistMobile(), memberPasswordDto.getCode());
         if (result.getCode() != ResponseResultCodeEnum.SUCCESS.getCode()) {
             return result;
         }
@@ -267,7 +251,47 @@ public class ApiDevelopServiceImpl implements ApiDevelopService {
         return ResponseResult.success();
     }
 
-    private ResponseResult specialJudge(Member member, String resistMobile, String code) {
+    @Override
+    public ResponseResult appSecretInfo(Long loginId) {
+        ResponseResult result = appInfoJudge(loginId);
+        if (result.getCode() != ResponseResultCodeEnum.SUCCESS.getCode()) {
+            return result;
+        }
+
+        AppInfo appInfo = (AppInfo) result.getData();
+
+        List<AppInfo> appInfoList = iAppInfoService.list(new QueryWrapper<AppInfo>().eq("deleted", 0).eq("name", appInfo.getName()));
+        return ResponseResult.success(appInfoList);
+    }
+
+    @Override
+    public ResponseResult setCallbackUrl(Long loginId, AppInfo appInfo) {
+        ResponseResult result = appInfoJudge(loginId);
+        if (result.getCode() != ResponseResultCodeEnum.SUCCESS.getCode()) {
+            return result;
+        }
+
+        AppInfo oldAppInfo = (AppInfo) result.getData();
+
+        List<AppInfo> appInfoList = iAppInfoService.list(new QueryWrapper<AppInfo>().eq("deleted", 0).eq("name", oldAppInfo.getName()));
+
+        appInfoList.stream().forEach(appInfo1 -> {
+            appInfo1.setStoreStatusNotifyUrl(appInfo.getStoreStatusNotifyUrl());
+            appInfo1.setOrderStatusNotifyUrl(appInfo.getOrderStatusNotifyUrl());
+
+            iAppInfoService.updateById(appInfo1);
+        });
+
+        return ResponseResult.success();
+    }
+
+    @Override
+    public ResponseResult selectCustomerList(String cityName, String businessName, String contactName) {
+        List<OpenCustomerDto> customerVoList = iMerchantService.selectCustomerList(cityName, businessName, contactName);
+        return ResponseResult.success(new PageResult(customerVoList));
+    }
+
+    private ResponseResult memberInfoJudge(Member member, String resistMobile, String code) {
         ResponseResult result = ResponseResult.success();
 
         if (Objects.isNull(member)) {
@@ -281,8 +305,9 @@ public class ApiDevelopServiceImpl implements ApiDevelopService {
         return result;
     }
 
-    @Override
-    public ResponseResult appSecretInfo(Long loginId) {
+    private ResponseResult appInfoJudge(Long loginId) {
+        ResponseResult result = ResponseResult.success();
+
         Member member = iMemberService.getById(loginId);
         if (Objects.isNull(member)) {
             return ResponseResult.error(ResponseResultCodeEnum.REFRESH_TOKEN_INVALID);
@@ -294,8 +319,8 @@ public class ApiDevelopServiceImpl implements ApiDevelopService {
             return ResponseResult.error(ResponseResultCodeEnum.APP_ID_ERR);
         }
 
-        List<AppInfo> appInfoList = iAppInfoService.list(new QueryWrapper<AppInfo>().eq("deleted", 0).eq("name", appInfo.getName()));
-        return ResponseResult.success(appInfoList);
+        result.setData(appInfo);
+        return result;
     }
 
 }

lb-module/src/main/java/com/ydd/module/dto/OpenCustomerDto.java

@@ -0,0 +1,54 @@
+package com.ydd.module.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2022/4/27 15:38
+ */
+@Data
+public class OpenCustomerDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 城市名称 */
+    @ApiModelProperty(value = "城市")
+    private String cityName;
+
+    /** 企业名称 */
+    @ApiModelProperty(value = "公司名称")
+    private String businessName;
+
+    /** 联系人 */
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+    /** 联系人电话 */
+    @ApiModelProperty(value = "联系人电话")
+    private String contactMobile;
+
+    /** 合同有效期 */
+    @ApiModelProperty(value = "合同有效期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 保证金 */
+    @ApiModelProperty("保证金")
+    private BigDecimal earnestMoney;
+
+    /** 状态：0->禁用，1->待认证, 2->已认证 */
+    private Integer status;
+}

lb-module/src/main/java/com/ydd/module/mapper/MerchantMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydd.module.domain.Merchant;
-import com.ydd.module.dto.DadaDspMerchantInfoDto;
-import com.ydd.module.dto.DadaDspMerchantListQuery;
-import com.ydd.module.dto.MerchantExportDto;
-import com.ydd.module.dto.SystemMerchantDto;
+import com.ydd.module.dto.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -52,4 +49,6 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
 
     List<Merchant> selectListByDadaDspId(@Param("dadaDspId") Long dadaDspId);
 
+    List<OpenCustomerDto> selectCustomerList(@Param("cityName") String cityName, @Param("businessName") String businessName, @Param("contactName") String contactName);
+
 }

lb-module/src/main/java/com/ydd/module/service/IMerchantService.java

@@ -118,4 +118,6 @@ public interface IMerchantService extends IService<Merchant> {
      * @return
      */
     List<Merchant> selectListByDadaDspId(Long dadaDspId);
+
+    List<OpenCustomerDto> selectCustomerList(String cityName, String businessName, String contactName);
 }

lb-module/src/main/java/com/ydd/module/service/impl/MerchantServiceImpl.java

@@ -735,4 +735,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     public List<Merchant> selectListByDadaDspId(Long dadaDspId) {
         return baseMapper.selectListByDadaDspId(dadaDspId);
     }
+
+    @Override
+    public List<OpenCustomerDto> selectCustomerList(String cityName, String businessName, String contactName) {
+        return baseMapper.selectCustomerList(cityName, businessName, contactName);
+    }
 }

lb-module/src/main/resources/mapper/module/merchantMapper.xml

@@ -340,4 +340,28 @@
         AND dada_dsp_id = #{dadaDspId}
     </select>
 
+    <select id="selectCustomerList" resultType="com.ydd.module.dto.OpenCustomerDto">
+        SELECT
+            ai.create_time,
+            m.city_name,
+            m.merchant_name AS businessName,
+            m.contact_name,
+            m.mobile AS contactMobile,
+            ai.end_time,
+            ai.earnest_money,
+            m.status
+        FROM lb_merchant m
+        LEFT JOIN lb_app_info ai ON m.app_id = ai.id
+        WHERE m.deleted = 0
+        <if test="cityName != null and cityName != ''">
+            AND m.city_name = #{cityName}
+        </if>
+        <if test="businessName != null and businessName != ''">
+            AND m.merchant_name = #{businessName}
+        </if>
+        <if test="contactName != null and contactName != ''">
+            AND m.contact_name = #{contactName}
+        </if>
+    </select>
+
 </mapper>