From 81cacf08b40f18b5f37f322a565297de75932555 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 18:13:30 +0800
Subject: [PATCH] aa
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 9 +++-
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 2 +
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 16 ++++++++
server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java | 7 +++
server/services/src/main/java/com/doumee/dao/business/model/Multifile.java | 2
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 5 ++
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 2 -
server/services/src/main/java/com/doumee/service/business/MultifileService.java | 4 +-
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java | 3 +
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 18 ++++-----
server/platform/src/main/resources/application.yml | 2
server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 4 ++
server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java | 4 +-
13 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index b5c2c9e..a54e9b9 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -58,7 +58,7 @@
reasonable: true
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
- port: 10026
+ port: 10012
mqtt:
clientid: doumeetestplat
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
index be90149..6287b60 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
@@ -42,12 +42,17 @@
mess.setRetained(true);
mess.setPayload(message.getBytes());
try {
+<<<<<<< HEAD
MqttClientInit.getInstance(config).publish(topic, mess);
return 1;
+=======
+ MqttClientInit.getInstance(config,callBack).publish(topic, mess);
+ return 0;
+>>>>>>> 07088f4225d6c8d21e94cc4981d4c28960f114d8
} catch (Exception e) {
//LOGGER.error(e.getLocalizedMessage());
}
- return 0;
+ return 1;
}
public static void main(String[] args) {
MqttToolService client1 = new MqttToolService();
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index e472eb2..c9227a3 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,8 +46,13 @@
WxPayRefundRequest request = new WxPayRefundRequest();
request.setOutTradeNo(refundDTO.getOrderId());
request.setOutRefundNo(refNum);
- request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
- request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+// request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+// request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+ System.out.println("瀹為檯鎬婚噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+ System.out.println("瀹為檯閫�娆鹃噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+
+ request.setTotalFee(1);
+ request.setRefundFee(1);
WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
//瀛樺偍閫�娆捐褰� 涓� 娴佹按璁板綍
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java b/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
index 2bc4425..17475f1 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
@@ -18,7 +18,11 @@
*/
@Data
@ApiModel("绯荤粺琛屼负鎿嶄綔璁板綍琛�")
+<<<<<<< HEAD
@TableName("\"mqtt_log\"")
+=======
+@TableName("mqtt_log")
+>>>>>>> 07088f4225d6c8d21e94cc4981d4c28960f114d8
public class MqttLog {
@ApiModelProperty(value = "缂栫爜")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
index f1c469f..79457b4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -24,7 +24,7 @@
@ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
- private Integer id;
+ private String id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
index 46e45ec..0dced2a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -37,8 +37,6 @@
@ApiModelProperty(value = "绉熻祦椤荤煡")
private String leaseNotice;
- @ApiModelProperty(value = "璁′环瑙勫垯")
- private String pricingRules;
@ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲戯紱")
private Integer depositStatus = 0;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
index 631d776..fc9d167 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -52,4 +52,7 @@
@ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅")
private Integer unitTime;
+
+ @ApiModelProperty(value = "楠戣璁板綍涓婚敭")
+ private String rideId;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/MultifileService.java b/server/services/src/main/java/com/doumee/service/business/MultifileService.java
index c57bf46..5316943 100644
--- a/server/services/src/main/java/com/doumee/service/business/MultifileService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MultifileService.java
@@ -19,14 +19,14 @@
* @param multifile 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Multifile multifile);
+ String create(Multifile multifile);
/**
* 涓婚敭鍒犻櫎
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(String id);
/**
* 鍒犻櫎
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 556b696..b4dc2e1 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -165,12 +165,14 @@
BeanUtils.copyProperties(repairRequest,bikeRepair);
bikeRepair.setCreateDate(new Date());
bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepair.setId(Constants.getUUID());
bikeRepairMapper.insert(bikeRepair);
//澶勭悊闄勪欢淇℃伅
List<String> stringList = repairRequest.getFileUrlList();
if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){
for (int i = 0; i < stringList.size(); i++) {
Multifile multifile = new Multifile();
+ multifile.setId(Constants.getUUID());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
multifile.setSortnum(i+Constants.ONE);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index a1b7255..2929f7e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -243,7 +243,6 @@
homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
- homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
@@ -263,8 +262,10 @@
homeResponse.setDepositStatus(Constants.goodsorderStatus.pay);
homeResponse.setGoodsOrderId(goodsorder.getId());
//鏌ヨ褰撳墠楠戣鐘舵��
- MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
- .orderByDesc(" create_date ")
+ MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
+ .eq(MemberRides::getMemberId, memberId)
+ .eq(MemberRides::getOrdreId,goodsorder.getId())
+ .orderByDesc(MemberRides::getCreateDate)
.last(" limit 1 "));
if (!Objects.isNull(memberRides)) {
homeResponse.setRideStatus(memberRides.getStatus());
@@ -273,6 +274,7 @@
if(!Objects.isNull(baseParam)){
memberRidesResponse.setBikeType(baseParam.getName());
}
+ memberRidesResponse.setRideId(memberRides.getId());
memberRidesResponse.setRideStartTime(memberRides.getRentDate());
memberRidesResponse.setRideEndTime(memberRides.getBackDate());
memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime()));
@@ -412,7 +414,7 @@
transactions.setCreateDate(new Date());
transactions.setIsdeleted(Constants.ZERO);
transactions.setOrderId(goodsorder.getId());
- transactions.setMoney(goodsorder.getMoney());
+ transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
transactions.setDoneDate(new Date());
transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
@@ -593,11 +595,7 @@
int finalFreeTime = freeTime;
List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
- Date endTime =memberRidesResponse.getRideEndTime();
- if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
- //濡傛灉鏄獞琛屼腑
- endTime = new Date();
- }
+ Date endTime =s.getBackDate();
int rideTime =DateUtil.betweenMin(s.getRentDate(), endTime);
memberRidesResponse.setRideStartTime(s.getRentDate());
memberRidesResponse.setRideEndTime(endTime);
@@ -617,7 +615,7 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);;
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);;
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
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 f2cab9a..1a2b104 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
@@ -438,6 +438,7 @@
memberRides.setRentSiteId(locks.getSiteId());
memberRides.setRentLockId(locks.getId());
memberRides.setOrdreId(goodsorder.getId());
+ memberRides.setRentDate(new Date());
memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
@@ -476,7 +477,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曞摝锛�");
}
QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
- detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId());
+ detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
detail.lambda().last(" limit 1" ) ;
//鏌ヨ浼樺厛绾ф渶楂橈紙鎺掑簭鐮佹渶灏忕殑锛夊彲鐢ㄩ厤浠锋柟妗�
@@ -489,6 +491,7 @@
holidays.setHoliday(nowDate);
holidays.setIsdeleted(Constants.ZERO);
memberRides.setBikeCode(bike.getCode());
+ memberRides.setParamId(bike.getParamId());
bike.setLastRentDate(new Date());
bike.setStatus(Constants.ONE);
bikesMapper.updateById(bike);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
index 0b5cf5b..e45ef96 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
@@ -28,13 +28,13 @@
private MultifileMapper multifileMapper;
@Override
- public Integer create(Multifile multifile) {
+ public String create(Multifile multifile) {
multifileMapper.insert(multifile);
return multifile.getId();
}
@Override
- public void deleteById(Integer id) {
+ public void deleteById(String id) {
multifileMapper.deleteById(id);
}
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index f714118..516bbc7 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -1,5 +1,6 @@
package com.doumee.api.web;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
@@ -13,6 +14,7 @@
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -55,6 +57,9 @@
@Autowired
private MemberRidesService memberRidesService;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@@ -178,4 +183,15 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @LoginRequired
+ @ApiOperation(value = "鑾峰彇瀛楀吀鍊间俊鎭�", notes = "灏忕▼搴忕")
+ @GetMapping("/getSysDict")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "dicCode", value = "瀛楀吀缂栫爜", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "瀛楀吀鏁板�肩紪鐮�", required = true)
+ })
+ public ApiResponse<SystemDictData> getSysDict(@RequestParam String dicCode, @RequestParam String label) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label));
+ }
}
--
Gitblit v1.9.3