积分消耗清单
This commit is contained in:
parent
e4a50de8db
commit
fd95869a59
|
@ -94,6 +94,7 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
BusAgentInfo busAgentInfo = new BusAgentInfo();
|
BusAgentInfo busAgentInfo = new BusAgentInfo();
|
||||||
busAgentInfo.setAgentAccount(cookie.getUserName());
|
busAgentInfo.setAgentAccount(cookie.getUserName());
|
||||||
List<BusAgentInfo> list1 = iBusAgentInfoService.selectBusAgentInfoList(busAgentInfo);
|
List<BusAgentInfo> list1 = iBusAgentInfoService.selectBusAgentInfoList(busAgentInfo);
|
||||||
|
Date date = new Date();
|
||||||
if (list.size() == 0) {
|
if (list.size() == 0) {
|
||||||
storeInfo.setBindId(list1.get(0).getId());
|
storeInfo.setBindId(list1.get(0).getId());
|
||||||
storeInfo.setBindUser(cookie.getUserName());
|
storeInfo.setBindUser(cookie.getUserName());
|
||||||
|
@ -102,25 +103,25 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
storeInfo.setStoreName(cookie.getWmPoiName());
|
storeInfo.setStoreName(cookie.getWmPoiName());
|
||||||
storeInfo.setStoreCookie(cookie.getCookie());
|
storeInfo.setStoreCookie(cookie.getCookie());
|
||||||
storeInfo.setPlatformType(String.valueOf(cookie.getBingType()));
|
storeInfo.setPlatformType(String.valueOf(cookie.getBingType()));
|
||||||
storeInfo.setBindTime(new Date());
|
storeInfo.setBindTime(date);
|
||||||
storeInfo.setUpdateTime(new Date());
|
storeInfo.setUpdateTime(date);
|
||||||
storeInfo.setGrantStatus("1");//授权登录状态
|
storeInfo.setGrantStatus("1");//授权登录状态
|
||||||
storeInfo.setReturnVisitStatus("2");// 营销状态
|
storeInfo.setReturnVisitStatus("2");// 营销状态
|
||||||
storeInfo.setSelfDeliveryStatus("1");// 1 正常, 2 自配送, 3 删除
|
storeInfo.setSelfDeliveryStatus("1");// 1 正常, 2 自配送, 3 删除
|
||||||
busStoreInfoService.insertBusStoreInfo(storeInfo);
|
busStoreInfoService.insertBusStoreInfo(storeInfo);
|
||||||
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
|
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
|
||||||
busStoreDayInfo.setStoreId(storeInfo.getId());
|
busStoreDayInfo.setStoreId(storeInfo.getId());
|
||||||
busStoreDayInfo.setCreateTime(new Date());
|
busStoreDayInfo.setCreateTime(date);
|
||||||
busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo);
|
busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo);
|
||||||
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
|
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
|
||||||
busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
|
busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
|
||||||
busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
|
busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
|
||||||
|
|
||||||
try {
|
// try {
|
||||||
Thread.sleep(3000);
|
// Thread.sleep(3000);
|
||||||
} catch (InterruptedException e) {
|
// } catch (InterruptedException e) {
|
||||||
throw new RuntimeException(e);
|
// throw new RuntimeException(e);
|
||||||
}
|
// }
|
||||||
// getCommentsOne(storeInfo);
|
// getCommentsOne(storeInfo);
|
||||||
// getScoreOne(storeInfo);
|
// getScoreOne(storeInfo);
|
||||||
// yesterdayCountOne(storeInfo);
|
// yesterdayCountOne(storeInfo);
|
||||||
|
@ -128,10 +129,15 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
return R.ok();
|
return R.ok();
|
||||||
} else if (list.size() == 1) {
|
} else if (list.size() == 1) {
|
||||||
if (!cookie.getUserName().equals(list.get(0).getBindUser())) {
|
if (!cookie.getUserName().equals(list.get(0).getBindUser())) {
|
||||||
|
if(!"3".equals(list.get(0).getSelfDeliveryStatus())){
|
||||||
throw new ServiceException("授权失败,已绑定其他代理账号!");
|
throw new ServiceException("授权失败,已绑定其他代理账号!");
|
||||||
}
|
}
|
||||||
storeInfo.setId(list.get(0).getId());
|
storeInfo.setId(list.get(0).getId());
|
||||||
storeInfo.setUpdateTime(new Date());
|
storeInfo.setBindId(list1.get(0).getId());
|
||||||
|
storeInfo.setBindUser(cookie.getUserName());
|
||||||
|
storeInfo.setStoreAccount(cookie.getAccount());
|
||||||
|
storeInfo.setStorePassword(cookie.getPassword());
|
||||||
|
storeInfo.setUpdateTime(date);
|
||||||
storeInfo.setUpdateId(list1.get(0).getId());
|
storeInfo.setUpdateId(list1.get(0).getId());
|
||||||
storeInfo.setUpdateUser(cookie.getUserName());
|
storeInfo.setUpdateUser(cookie.getUserName());
|
||||||
storeInfo.setStoreAccount(cookie.getAccount());
|
storeInfo.setStoreAccount(cookie.getAccount());
|
||||||
|
@ -139,6 +145,19 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
storeInfo.setStoreName(cookie.getWmPoiName());
|
storeInfo.setStoreName(cookie.getWmPoiName());
|
||||||
storeInfo.setStoreCookie(cookie.getCookie());
|
storeInfo.setStoreCookie(cookie.getCookie());
|
||||||
storeInfo.setGrantStatus("1");//授权登录状态
|
storeInfo.setGrantStatus("1");//授权登录状态
|
||||||
|
}else{
|
||||||
|
storeInfo.setId(list.get(0).getId());
|
||||||
|
storeInfo.setStoreAccount(cookie.getAccount());
|
||||||
|
storeInfo.setStorePassword(cookie.getPassword());
|
||||||
|
storeInfo.setUpdateTime(date);
|
||||||
|
storeInfo.setUpdateId(list1.get(0).getId());
|
||||||
|
storeInfo.setUpdateUser(cookie.getUserName());
|
||||||
|
storeInfo.setStoreAccount(cookie.getAccount());
|
||||||
|
storeInfo.setStorePassword(cookie.getPassword());
|
||||||
|
storeInfo.setStoreName(cookie.getWmPoiName());
|
||||||
|
storeInfo.setStoreCookie(cookie.getCookie());
|
||||||
|
storeInfo.setGrantStatus("1");//授权登录状态
|
||||||
|
}
|
||||||
return R.ok(busStoreInfoService.updateBusStoreInfo(storeInfo));
|
return R.ok(busStoreInfoService.updateBusStoreInfo(storeInfo));
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceException("授权失败,请重试!");
|
throw new ServiceException("授权失败,请重试!");
|
||||||
|
|
|
@ -117,10 +117,10 @@
|
||||||
<el-form-item label="姓名" prop="agentName">
|
<el-form-item label="姓名" prop="agentName">
|
||||||
<el-input v-model="form.agentName" placeholder="请输入代理人姓名" />
|
<el-input v-model="form.agentName" placeholder="请输入代理人姓名" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="密码" prop="superiorAgentCode">
|
<el-form-item label="密码" prop="password">
|
||||||
<el-input type="password" v-model="form.password" placeholder="请输入密码" />
|
<el-input type="password" v-model="form.password" placeholder="请输入密码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="确认密码" prop="superiorAgentAccount">
|
<el-form-item label="确认密码" prop="confirmPassword">
|
||||||
<el-input type="password" v-model="form.confirmPassword" placeholder="请输入确认密码" />
|
<el-input type="password" v-model="form.confirmPassword" placeholder="请输入确认密码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="代理级别" prop="deptId">
|
<el-form-item label="代理级别" prop="deptId">
|
||||||
|
@ -139,7 +139,7 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="手机号" prop="operateStoreNum">
|
<el-form-item label="手机号" prop="phoneNumber">
|
||||||
<el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
|
<el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
@ -237,15 +237,19 @@ export default {
|
||||||
agentName: null,
|
agentName: null,
|
||||||
superiorAgentCode: null,
|
superiorAgentCode: null,
|
||||||
superiorAgentAccount: null,
|
superiorAgentAccount: null,
|
||||||
grantStoreNum: null,
|
deptId: null,
|
||||||
operateStoreNum: null,
|
operateStoreNum: null,
|
||||||
lastUseIntegralNum: null,
|
lastUseIntegralNum: null,
|
||||||
lastPositiveReviewsNum: null,
|
lastPositiveReviewsNum: null,
|
||||||
aiDurationBalance: null,
|
aiDurationBalance: null,
|
||||||
|
aiDurationBalance1: null,
|
||||||
lastLoginTime: null,
|
lastLoginTime: null,
|
||||||
lastLoginIp: null,
|
lastLoginIp: null,
|
||||||
loginNum: null,
|
loginNum: null,
|
||||||
delStatus: null
|
delStatus: null,
|
||||||
|
phoneNumber: null,
|
||||||
|
confirmPassword: null,
|
||||||
|
password: null,
|
||||||
};
|
};
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
|
|
|
@ -58,8 +58,8 @@
|
||||||
<el-table-column label="标识" prop="storeCode" />
|
<el-table-column label="标识" prop="storeCode" />
|
||||||
<el-table-column label="发送号码" prop="phoneNumber" align="center" width=""/>
|
<el-table-column label="发送号码" prop="phoneNumber" align="center" width=""/>
|
||||||
<el-table-column label="四位尾号" prop="phoneEndNumber" align="center" width=""/>
|
<el-table-column label="四位尾号" prop="phoneEndNumber" align="center" width=""/>
|
||||||
<el-table-column label="完成时间" prop="returnVisitTime" align="center" width=""/>
|
<el-table-column label="营销时间" prop="returnVisitTime" align="center" width=""/>
|
||||||
<el-table-column label="营销时间" prop="finishTime" align="center" width=""/>
|
<el-table-column label="营销完成时间" prop="finishTime" align="center" width=""/>
|
||||||
|
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue