parent
69708a890e
commit
9d5b573315
|
@ -5,6 +5,7 @@ import com.ruoyi.business.domain.BusStoreInfo;
|
||||||
import com.ruoyi.business.service.IBusAgentInfoService;
|
import com.ruoyi.business.service.IBusAgentInfoService;
|
||||||
import com.ruoyi.business.service.IBusStoreInfoService;
|
import com.ruoyi.business.service.IBusStoreInfoService;
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
|
import com.ruoyi.common.annotation.RepeatSubmit;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
|
@ -150,7 +151,7 @@ public class BusAgentInfoController extends BaseController {
|
||||||
// @PreAuthorize("@ss.hasPermi('system:info:edit')")
|
// @PreAuthorize("@ss.hasPermi('system:info:edit')")
|
||||||
@Log(title = "代理管理", businessType = BusinessType.UPDATE)
|
@Log(title = "代理管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
@Transactional
|
@RepeatSubmit
|
||||||
public AjaxResult edit(@RequestBody BusAgentInfo busAgentInfo) {
|
public AjaxResult edit(@RequestBody BusAgentInfo busAgentInfo) {
|
||||||
LoginUser user = SecurityUtils.getLoginUser();
|
LoginUser user = SecurityUtils.getLoginUser();
|
||||||
BusAgentInfo busAgentInfo1 = busAgentInfoService.selectBusAgentInfoById(user.getUserId());
|
BusAgentInfo busAgentInfo1 = busAgentInfoService.selectBusAgentInfoById(user.getUserId());
|
||||||
|
|
|
@ -228,7 +228,7 @@ public class AiConsumer {
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
log.error("营销事件推出-下次继续=====================");
|
log.error("营销事件推出-下次继续=====================");
|
||||||
throw new ServiceException("营销事件推出-下次继续");
|
throw new ServiceException("营销事件推出-下次继续:"+busOrderInfo.getOrderNo());
|
||||||
}
|
}
|
||||||
System.out.println(("一共耗时time: " + (System.currentTimeMillis() - startTime) / 1000 + " s"));
|
System.out.println(("一共耗时time: " + (System.currentTimeMillis() - startTime) / 1000 + " s"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -319,7 +319,6 @@ public class AiServiceImpl implements IAiService {
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = ServiceException.class)
|
@Transactional(rollbackFor = ServiceException.class)
|
||||||
public void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
|
public void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
|
||||||
lock.lock();
|
|
||||||
try {
|
try {
|
||||||
String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
|
String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
|
||||||
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(limitNum);
|
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(limitNum);
|
||||||
|
@ -351,10 +350,8 @@ public class AiServiceImpl implements IAiService {
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
log.error("建立sendSmsTask错误: ",e.getMessage());
|
log.error(busOrderInfo.getOrderNo()+"建立sendSmsTask错误: "+e.getMessage());
|
||||||
throw new ServiceException("短信发送失败!");
|
throw new ServiceException("短信发送失败!");
|
||||||
}finally {
|
|
||||||
lock.unlock();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -191,19 +191,25 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
recordService.insertBusIntegralRecord(record);
|
recordService.insertBusIntegralRecord(record);
|
||||||
busAgentInfoMapper.updateBusAgentInfo(busAgentInfo);
|
busAgentInfoMapper.updateBusAgentInfo(busAgentInfo);
|
||||||
|
|
||||||
|
BusAgentInfo temp1 = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getSuperiorAgentCode());
|
||||||
BusIntegralRecord record1 = new BusIntegralRecord();
|
BusIntegralRecord record1 = new BusIntegralRecord();
|
||||||
record1.setAccount(busAgentInfo.getSuperiorAgentAccount());
|
record1.setAccount(busAgentInfo.getSuperiorAgentAccount());
|
||||||
record1.setUpdateType("出账");
|
record1.setUpdateType("出账");
|
||||||
record1.setCreateUser(busAgentInfo.getAgentAccount());
|
record1.setCreateUser(busAgentInfo.getAgentAccount());
|
||||||
// record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
// record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
if(busAgentInfo.getAiDurationBalance1()!=0){
|
if(busAgentInfo.getAiDurationBalance1()!=0){
|
||||||
|
if(temp1.getAiDurationBalance()<busAgentInfo.getAiDurationBalance1()){
|
||||||
|
throw new ServiceException("安全账分余额不足!请联系管理员充值。");
|
||||||
|
}
|
||||||
record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
record1.setIntegralType("sms");
|
record1.setIntegralType("sms");
|
||||||
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
||||||
|
if(temp1.getAiRealTimeNum()<busAgentInfo.getAiRealTimeNum1()){
|
||||||
|
throw new ServiceException("普通账分余额不足!请联系管理员充值。");
|
||||||
|
}
|
||||||
record1.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
record1.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
||||||
record1.setIntegralType("AI");
|
record1.setIntegralType("AI");
|
||||||
}
|
}
|
||||||
BusAgentInfo temp1 = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getSuperiorAgentCode());
|
|
||||||
if(busAgentInfo.getSuperiorAgentCode() == 1){
|
if(busAgentInfo.getSuperiorAgentCode() == 1){
|
||||||
record1.setIntegralUpdateTime(new Date());
|
record1.setIntegralUpdateTime(new Date());
|
||||||
recordService.insertBusIntegralRecord(record1);
|
recordService.insertBusIntegralRecord(record1);
|
||||||
|
|
Loading…
Reference in New Issue