From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 34 ++++++++++++----
server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java | 4 +-
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 53 ++++++++++++++++++++++----
3 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
index 92a8106..6ad0cc7 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
@@ -19,7 +19,7 @@
try {
// host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
// String clientId =config.getClientid()+ Constants.getUUID();
- String clientId =config.getClientid()+"009";
+ String clientId =config.getClientid()+"001";
client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
// MQTT鐨勮繛鎺ヨ缃�
MqttConnectOptions options = new MqttConnectOptions();
@@ -51,7 +51,7 @@
try {
// host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
// String clientId =config.getClientid()+ Constants.getUUID();
- String clientId =config.getSubclientid();
+ String clientId =config.getSubclientid()+"001";
subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
// MQTT鐨勮繛鎺ヨ缃�
MqttConnectOptions options = new MqttConnectOptions();
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 1a2b104..77ee27d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -36,6 +36,7 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -74,10 +75,13 @@
@Autowired
private SitesMapper sitesMapper;
@Autowired
+ private BaseParamMapper baseParamMapper;
+ @Autowired
private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ @Lazy
private GoodsorderService goodsorderService;
@@ -446,8 +450,6 @@
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
-
-
return memberRidesDetailResponse;
}
@@ -523,7 +525,6 @@
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
return memberRidesDetailResponse;
-
}
/**
@@ -540,7 +541,6 @@
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
-
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
if(model.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
@@ -588,10 +588,28 @@
}
- //TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ /**
+ -----------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
+ *
+ */
private String getBileTypeByCode(String bikeCode) {
- int temp=1+(int)(Math.random()*(8));
- return temp+"";
+// int temp=1+(int)(Math.random()*(8));
+ if(StringUtils.isBlank(bikeCode)){
+ return null;
+ }
+ String type = bikeCode.substring(0,1);
+ if("1,2,3,4,5,6,7,8".contains(type)){
+ return null;
+ }
+ BaseParam param = new BaseParam();
+ param.setIsdeleted(Constants.ZERO);
+ param.setType(Constants.THREE);
+ param.setSortnum(Integer.parseInt(type));
+ param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
+ if(param == null){
+ return null;
+ }
+ return param.getId();
}
private Locks dealLockAndSite(Locks locks) {
@@ -610,7 +628,6 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
-
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
@@ -632,7 +649,6 @@
model.setBikeCode(locks.getBikeCode());
model.setStatus(locks.getStatus());
locksMapper.update(null, new QueryWrapper<>(model));
-
}
model.setSites(sites);
return model;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
index c05d038..882678f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -56,13 +56,13 @@
insert.setPricePramId(pricingDetail.getPricePramId());
insert.setBikeTypeId(pricingDetail.getBikeTypeId());
insert.setBaseTime(pricingDetail.getBaseTime());
- insert.setBasePrice(pricingDetail.getBasePrice());
insert.setUnitTime(pricingDetail.getUnitTime());
- insert.setUnitPrice(pricingDetail.getUnitPrice());
insert.setHolidayBaseTime(pricingDetail.getHolidayBaseTime());
- insert.setHolidayBasePrice(pricingDetail.getHolidayBasePrice());
insert.setHolidayUnitTime(pricingDetail.getHolidayUnitTime());
- insert.setHolidayUnitPrice(pricingDetail.getHolidayUnitPrice());
+ insert.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
+ insert.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
+ insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
+ insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
insert.setInfo(pricingDetail.getInfo());
insert.setTitle(pricingDetail.getTitle());
pricingDetailMapper.insert(pricingDetail);
@@ -134,6 +134,11 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
pricingDetail.setEditDate(new Date());
pricingDetail.setEditor(principal.getId());
+ pricingDetail.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
+
pricingDetailMapper.updateById(pricingDetail);
}
@@ -149,13 +154,27 @@
@Override
public PricingDetail findById(String id) {
- return pricingDetailMapper.selectById(id);
+ PricingDetail model = pricingDetailMapper.selectById(id);
+ if(model !=null ){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ return model;
}
@Override
public PricingDetail findOne(PricingDetail pricingDetail) {
QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
- return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
+ PricingDetail model = pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
+ if(model !=null ){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ return model;
}
@Override
@@ -166,7 +185,16 @@
.eq(BaseParam::getType,Constants.THREE);
wrapper.selectAll(PricingDetail.class)
.selectAs(BaseParam::getName,PricingDetail::getBikeTypeName);
- return pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
+ List<PricingDetail> result = pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
+ if(result!=null){
+ for(PricingDetail model :result){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ }
+ return result;
}
@Override
@@ -237,7 +265,16 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(pricingDetailMapper.selectPage(page, queryWrapper));
+ IPage<PricingDetail> result =pricingDetailMapper.selectPage(page, queryWrapper);
+ if(result.getRecords()!= null ){
+ for(PricingDetail model : result.getRecords()){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ }
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3