wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

积分消耗清单

This commit is contained in:
wangshuai 2024-07-12 16:59:43 +08:00
parent e4a50de8db
commit fd95869a59
3 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -94,6 +94,7 @@ public class MeituanServiceImpl implements IMeituanService {
BusAgentInfo busAgentInfo = new BusAgentInfo();
busAgentInfo.setAgentAccount(cookie.getUserName());
List<BusAgentInfo> list1 = iBusAgentInfoService.selectBusAgentInfoList(busAgentInfo);
Date date = new Date();
if (list.size() == 0) {
storeInfo.setBindId(list1.get(0).getId());
storeInfo.setBindUser(cookie.getUserName());
@ -102,25 +103,25 @@ public class MeituanServiceImpl implements IMeituanService {
storeInfo.setStoreName(cookie.getWmPoiName());
storeInfo.setStoreCookie(cookie.getCookie());
storeInfo.setPlatformType(String.valueOf(cookie.getBingType()));
storeInfo.setBindTime(new Date());
storeInfo.setUpdateTime(new Date());
storeInfo.setBindTime(date);
storeInfo.setUpdateTime(date);
storeInfo.setGrantStatus("1");//授权登录状态
storeInfo.setReturnVisitStatus("2");// 营销状态
storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除
busStoreInfoService.insertBusStoreInfo(storeInfo);
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
busStoreDayInfo.setStoreId(storeInfo.getId());
busStoreDayInfo.setCreateTime(new Date());
busStoreDayInfo.setCreateTime(date);
busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo);
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// try {
// Thread.sleep(3000);
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
// getCommentsOne(storeInfo);
// getScoreOne(storeInfo);
// yesterdayCountOne(storeInfo);
@ -128,17 +129,35 @@ public class MeituanServiceImpl implements IMeituanService {
return R.ok();
} else if (list.size() == 1) {
if (!cookie.getUserName().equals(list.get(0).getBindUser())) {
throw new ServiceException("授权失败，已绑定其他代理账号！");
if(!"3".equals(list.get(0).getSelfDeliveryStatus())){
throw new ServiceException("授权失败，已绑定其他代理账号！");
}
storeInfo.setId(list.get(0).getId());
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.setUpdateUser(cookie.getUserName());
storeInfo.setStoreAccount(cookie.getAccount());
storeInfo.setStorePassword(cookie.getPassword());
storeInfo.setStoreName(cookie.getWmPoiName());
storeInfo.setStoreCookie(cookie.getCookie());
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");//授权登录状态
}
storeInfo.setId(list.get(0).getId());
storeInfo.setUpdateTime(new 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));
} else {
throw new ServiceException("授权失败，请重试！");

14
ruoyi-ui/src/views/agent/list/index.vue
View File

@ -117,10 +117,10 @@
<el-form-item label="姓名" prop="agentName">
<el-input v-model="form.agentName" placeholder="请输入代理人姓名" />
</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-form-item>
<el-form-item label="确认密码" prop="superiorAgentAccount">
<el-form-item label="确认密码" prop="confirmPassword">
<el-input type="password" v-model="form.confirmPassword" placeholder="请输入确认密码" />
</el-form-item>
<el-form-item label="代理级别" prop="deptId">
@ -139,7 +139,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="手机号" prop="operateStoreNum">
<el-form-item label="手机号" prop="phoneNumber">
<el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
</el-form-item>
</el-form>
@ -237,15 +237,19 @@ export default {
agentName: null,
superiorAgentCode: null,
superiorAgentAccount: null,
grantStoreNum: null,
deptId: null,
operateStoreNum: null,
lastUseIntegralNum: null,
lastPositiveReviewsNum: null,
aiDurationBalance: null,
aiDurationBalance1: null,
lastLoginTime: null,
lastLoginIp: null,
loginNum: null,
delStatus: null
delStatus: null,
phoneNumber: null,
confirmPassword: null,
password: null,
};
this.resetForm("form");
},

4
ruoyi-ui/src/views/statistics/visit/index.vue
View File

@ -58,8 +58,8 @@
<el-table-column label="标识" prop="storeCode" />
<el-table-column label="发送号码" prop="phoneNumber" 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="finishTime" align="center" width=""/>
<el-table-column label="营销时间" prop="returnVisitTime" align="center" width=""/>
<el-table-column label="营销完成时间" prop="finishTime" align="center" width=""/>
</el-table>