增加 获取账分 获取绑定代理人
This commit is contained in:
parent
6ea709ea13
commit
a3a626eab1
|
@ -58,4 +58,6 @@ public interface BusAgentInfoMapper
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int deleteBusAgentInfoByIds(Long[] ids);
|
public int deleteBusAgentInfoByIds(Long[] ids);
|
||||||
|
|
||||||
|
int getIntegralByAccount(String account);
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,4 +58,6 @@ public interface BusStoreInfoMapper
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int deleteBusStoreInfoByIds(Long[] ids);
|
public int deleteBusStoreInfoByIds(Long[] ids);
|
||||||
|
|
||||||
|
String getBindUserByStoreCode(String wmPoiId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,4 +58,12 @@ public interface IBusAgentInfoService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int deleteBusAgentInfoById(Long id);
|
public int deleteBusAgentInfoById(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据 account 获取剩余涨分
|
||||||
|
*
|
||||||
|
* @param account
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int getIntegralByAccount(String account);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,14 @@ public interface IBusStoreInfoService
|
||||||
*/
|
*/
|
||||||
public BusStoreInfo selectBusStoreInfoById(Long id);
|
public BusStoreInfo selectBusStoreInfoById(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据店铺编码获取店铺绑定的 代理人 信息
|
||||||
|
*
|
||||||
|
* @param wmPoiId 店铺信息主键
|
||||||
|
* @return 店铺信息
|
||||||
|
*/
|
||||||
|
public String getBindUserByStoreCode(String wmPoiId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询店铺信息列表
|
* 查询店铺信息列表
|
||||||
*
|
*
|
||||||
|
|
|
@ -90,4 +90,9 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
{
|
{
|
||||||
return busAgentInfoMapper.deleteBusAgentInfoById(id);
|
return busAgentInfoMapper.deleteBusAgentInfoById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getIntegralByAccount(String account) {
|
||||||
|
return busAgentInfoMapper.getIntegralByAccount(account);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,11 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
|
||||||
return busStoreInfoMapper.selectBusStoreInfoById(id);
|
return busStoreInfoMapper.selectBusStoreInfoById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getBindUserByStoreCode(String wmPoiId) {
|
||||||
|
return busStoreInfoMapper.getBindUserByStoreCode(wmPoiId);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询店铺信息列表
|
* 查询店铺信息列表
|
||||||
*
|
*
|
||||||
|
|
|
@ -5,18 +5,26 @@ import com.alibaba.fastjson2.JSONArray;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.ruoyi.business.domain.*;
|
import com.ruoyi.business.domain.*;
|
||||||
import com.ruoyi.business.mapper.BusOrderInfoMapper;
|
import com.ruoyi.business.mapper.BusOrderInfoMapper;
|
||||||
|
import com.ruoyi.business.mapper.BusReturnVisitInfoMapper;
|
||||||
import com.ruoyi.business.mapper.BusStoreDayInfoMapper;
|
import com.ruoyi.business.mapper.BusStoreDayInfoMapper;
|
||||||
import com.ruoyi.business.mapper.BusStoreInfoMapper;
|
import com.ruoyi.business.mapper.BusStoreInfoMapper;
|
||||||
|
import com.ruoyi.business.service.IBusAgentInfoService;
|
||||||
import com.ruoyi.business.service.IBusStoreDayInfoService;
|
import com.ruoyi.business.service.IBusStoreDayInfoService;
|
||||||
import com.ruoyi.business.service.IBusStoreInfoService;
|
import com.ruoyi.business.service.IBusStoreInfoService;
|
||||||
import com.ruoyi.business.service.IMeituanService;
|
import com.ruoyi.business.service.IMeituanService;
|
||||||
import com.ruoyi.common.config.ProxyProperties;
|
import com.ruoyi.common.config.ProxyProperties;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.domain.R;
|
||||||
import com.ruoyi.common.exception.ServiceException;
|
import com.ruoyi.common.exception.ServiceException;
|
||||||
|
import com.ruoyi.common.exception.job.TaskException;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
import com.ruoyi.quartz.service.ISysJobService;
|
||||||
import org.apache.http.HttpEntity;
|
import org.apache.http.HttpEntity;
|
||||||
import org.apache.http.HttpHost;
|
import org.apache.http.HttpHost;
|
||||||
import org.apache.http.HttpResponse;
|
import org.apache.http.HttpResponse;
|
||||||
|
import org.apache.http.auth.AuthScope;
|
||||||
|
import org.apache.http.auth.UsernamePasswordCredentials;
|
||||||
|
import org.apache.http.client.CredentialsProvider;
|
||||||
import org.apache.http.client.HttpClient;
|
import org.apache.http.client.HttpClient;
|
||||||
import org.apache.http.client.config.RequestConfig;
|
import org.apache.http.client.config.RequestConfig;
|
||||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||||
|
@ -24,9 +32,11 @@ import org.apache.http.client.methods.HttpGet;
|
||||||
import org.apache.http.client.methods.HttpPost;
|
import org.apache.http.client.methods.HttpPost;
|
||||||
import org.apache.http.entity.StringEntity;
|
import org.apache.http.entity.StringEntity;
|
||||||
import org.apache.http.entity.mime.MultipartEntityBuilder;
|
import org.apache.http.entity.mime.MultipartEntityBuilder;
|
||||||
|
import org.apache.http.impl.client.BasicCredentialsProvider;
|
||||||
import org.apache.http.impl.client.CloseableHttpClient;
|
import org.apache.http.impl.client.CloseableHttpClient;
|
||||||
import org.apache.http.impl.client.HttpClients;
|
import org.apache.http.impl.client.HttpClients;
|
||||||
import org.apache.http.util.EntityUtils;
|
import org.apache.http.util.EntityUtils;
|
||||||
|
import org.quartz.SchedulerException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -63,6 +73,12 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProxyProperties proxyProperties;
|
private ProxyProperties proxyProperties;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IBusAgentInfoService iBusAgentInfoService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private BusReturnVisitInfoMapper busReturnVisitInfoMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取cookie
|
* 获取cookie
|
||||||
*
|
*
|
||||||
|
@ -189,6 +205,7 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
@Override
|
@Override
|
||||||
public R orderInfo(String wmPoiId, String date, String cookie) {
|
public R orderInfo(String wmPoiId, String date, String cookie) {
|
||||||
int pageNum = 1;
|
int pageNum = 1;
|
||||||
|
|
||||||
JSONObject jsonObject = merchantOrders(pageNum, date, cookie);
|
JSONObject jsonObject = merchantOrders(pageNum, date, cookie);
|
||||||
String code = jsonObject.getString("code");
|
String code = jsonObject.getString("code");
|
||||||
if ("0".equals(code)) {
|
if ("0".equals(code)) {
|
||||||
|
@ -234,6 +251,7 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
}
|
}
|
||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
list.stream().sorted(Comparator.comparing(OrderInfo::getDaySeq)).collect(Collectors.toList());
|
list.stream().sorted(Comparator.comparing(OrderInfo::getDaySeq)).collect(Collectors.toList());
|
||||||
|
int integral = iBusAgentInfoService.getIntegralByAccount(busStoreInfoMapper.getBindUserByStoreCode(wmPoiId));
|
||||||
for (OrderInfo orderInfo : list) {
|
for (OrderInfo orderInfo : list) {
|
||||||
System.out.println(orderInfo.getDaySeq() + "," + orderInfo.getWmOrderViewId() + "," + orderInfo.getExpectTimeFmt() + "," + orderInfo.getStatusDesc());
|
System.out.println(orderInfo.getDaySeq() + "," + orderInfo.getWmOrderViewId() + "," + orderInfo.getExpectTimeFmt() + "," + orderInfo.getStatusDesc());
|
||||||
BusOrderInfo busOrderInfo = new BusOrderInfo(orderInfo);
|
BusOrderInfo busOrderInfo = new BusOrderInfo(orderInfo);
|
||||||
|
@ -357,6 +375,13 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
BusOrderInfo busOrderInfo = new BusOrderInfo(phoneInfo);
|
BusOrderInfo busOrderInfo = new BusOrderInfo(phoneInfo);
|
||||||
busOrderInfo.setId(id);
|
busOrderInfo.setId(id);
|
||||||
busOrderInfoMapper.updateBusOrderInfo(busOrderInfo);
|
busOrderInfoMapper.updateBusOrderInfo(busOrderInfo);
|
||||||
|
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
|
||||||
|
returnVisitInfo.setStoreCode(busOrderInfo.getStoreCode());
|
||||||
|
returnVisitInfo.setPhoneEndNumber(busOrderInfo.getRecipientPhone());
|
||||||
|
returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
|
||||||
|
//returnVisitInfo.setFinishTime(busOrderInfo.getCompleteTime()); todo
|
||||||
|
returnVisitInfo.setFinishTime(new Date());
|
||||||
|
busReturnVisitInfoMapper.insertBusReturnVisitInfo(returnVisitInfo);
|
||||||
}
|
}
|
||||||
return R.ok(JSON.toJSON(list));
|
return R.ok(JSON.toJSON(list));
|
||||||
}
|
}
|
||||||
|
@ -537,9 +562,19 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
private CloseableHttpClient proxyHttpClient() {
|
private CloseableHttpClient proxyHttpClient() {
|
||||||
String proxyHost = proxyProperties.getProxyAddr();
|
String proxyHost = proxyProperties.getProxyAddr();
|
||||||
int proxyPort = proxyProperties.getProxyPort();
|
int proxyPort = proxyProperties.getProxyPort();
|
||||||
|
String username = proxyProperties.getAccount();
|
||||||
|
String password = proxyProperties.getPwd();
|
||||||
HttpHost proxy = new HttpHost(proxyHost, proxyPort);
|
HttpHost proxy = new HttpHost(proxyHost, proxyPort);
|
||||||
|
CredentialsProvider credsProvider = new BasicCredentialsProvider();
|
||||||
|
credsProvider.setCredentials(new AuthScope(proxyHost, proxyPort),
|
||||||
|
new UsernamePasswordCredentials(username, password));
|
||||||
RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
|
RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
|
||||||
CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(config).build();
|
CloseableHttpClient httpClient = HttpClients
|
||||||
|
.custom()
|
||||||
|
.setDefaultRequestConfig(config)
|
||||||
|
.setDefaultCredentialsProvider(credsProvider)
|
||||||
|
.build();
|
||||||
|
// CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(config).build();
|
||||||
return httpClient;
|
return httpClient;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<include refid="selectBusAgentInfoVo"/>
|
<include refid="selectBusAgentInfoVo"/>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getIntegralByAccount" resultType="java.lang.Integer" >
|
||||||
|
select integral
|
||||||
|
from bus_agent_info
|
||||||
|
where id = #{account}
|
||||||
|
</select>
|
||||||
|
|
||||||
<insert id="insertBusAgentInfo" parameterType="BusAgentInfo">
|
<insert id="insertBusAgentInfo" parameterType="BusAgentInfo">
|
||||||
insert into bus_agent_info
|
insert into bus_agent_info
|
||||||
|
|
|
@ -58,10 +58,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectBusStoreInfoById" parameterType="Long" resultMap="BusStoreInfoResult">
|
<select id="selectBusStoreInfoById" parameterType="Long" resultMap="BusStoreInfoResult">
|
||||||
<include refid="selectBusStoreInfoVo"/>
|
select bind_user
|
||||||
|
from bus_store_info
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getBindUserByStoreCode" resultType="java.lang.String">
|
||||||
|
<include refid="selectBusStoreInfoVo"/>
|
||||||
|
where id = #{wmPoiId}
|
||||||
|
</select>
|
||||||
|
|
||||||
<insert id="insertBusStoreInfo" parameterType="BusStoreInfo" useGeneratedKeys="true" keyProperty="id">
|
<insert id="insertBusStoreInfo" parameterType="BusStoreInfo" useGeneratedKeys="true" keyProperty="id">
|
||||||
insert into bus_store_info
|
insert into bus_store_info
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
|
|
Loading…
Reference in New Issue