From d82554bc50065657fd01e29b5aa3b6daf70d0d0a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 17:32:19 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 12 +++++-
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 3 +
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 5 +-
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 4 ++
server/platform/src/main/java/com/doumee/api/common/TestController.java | 21 ++++++++--
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 12 +++--
10 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/common/TestController.java b/server/platform/src/main/java/com/doumee/api/common/TestController.java
index b38cf06..d0e9f90 100644
--- a/server/platform/src/main/java/com/doumee/api/common/TestController.java
+++ b/server/platform/src/main/java/com/doumee/api/common/TestController.java
@@ -5,8 +5,11 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
+import com.doumee.core.wx.WxMiniUtilService;
+import com.doumee.dao.business.model.Locks;
import com.doumee.service.business.DeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -15,10 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -46,6 +46,8 @@
@Autowired
+ private WxMiniUtilService wxMiniUtilService;
+ @Autowired
private DeviceService deviceService;
@@ -59,4 +61,15 @@
deviceService.testPush(topic,json);
}
+
+ @ApiOperation(value = "娴嬭瘯鐢熸垚浜岀淮鐮�", notes = "灏忕▼搴忕")
+ @GetMapping("/getCode")
+ public ApiResponse<Locks> generateWXMiniCode() {
+ Locks locks = new Locks();
+ locks.setCode(12);
+ locks.setSiteId("1005");
+ wxMiniUtilService.generateWXMiniCode(locks);
+ return ApiResponse.success("鎿嶄綔鎴愬姛",locks);
+ }
+
}
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 cb838eb..f9ab1dc 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
@@ -18,14 +18,18 @@
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
import com.github.binarywang.wxpay.exception.WxPayException;
+import io.netty.handler.codec.base64.Base64Decoder;
+import io.netty.handler.codec.base64.Base64Encoder;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import org.apache.commons.io.IOUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.misc.BASE64Decoder;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -152,14 +156,18 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
+ int i = inputStream.available(); // 寰楀埌鏂囦欢澶у皬
+ byte[] mFileBody = new byte[i];
+ inputStream.read(mFileBody); // 璇绘暟鎹�
+ locks.setInfo("data:image/Jpeg;base64," + Base64.getEncoder().encodeToString(mFileBody));
+/*
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len = -1;
while ((len = inputStream.read(buffer)) != -1) {
baos.write(buffer, 0, len);
- }
+ }*/
- locks.setInfo("data:mediatype;base64," + Base64.getEncoder().encodeToString(baos.toByteArray()));
// FileOutputStream out = new FileOutputStream("d:\\test.png");
// byte[] buffer = new byte[8192];
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index d00f00d..1db0976 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -140,8 +140,9 @@
queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%");
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getOpenid()+"%");
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent, pageWrap.getModel().getBikeCode() );
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),ActionLog::getBeforeContent, pageWrap.getModel().getOpenid() );
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName()),SystemUser::getRealname, pageWrap.getModel().getCreatorName());
queryWrapper.eq(ActionLog::getObjType,Constants.ActionLogObjType.memberrides);
queryWrapper
.selectAll(ActionLog.class)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index 60a84d6..de162d3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -140,7 +140,7 @@
queryWrapper.lambda().eq(Ad::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Ad::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Ad::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSortnum() != null) {
queryWrapper.lambda().eq(Ad::getSortnum, pageWrap.getModel().getSortnum());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index 6c10e38..60c9b79 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -122,7 +122,7 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
.like( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
- .ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
+ .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
.ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
.and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,
s->s.isNull(Bikes::getCode)
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 ae43981..22043e0 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
@@ -566,7 +566,7 @@
topRides = rides;
}
}
-// MemberRides topRides =memberRides.get(0);
+// MemberRides topRides =memberRides.get(0);
if(durationSum > 0 && topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index f80cc08..cca62d8 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -191,7 +191,7 @@
queryWrapper.lambda().eq(Member::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getNickname() != null) {
queryWrapper.lambda().eq(Member::getNickname, pageWrap.getModel().getNickname());
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 ea23ebc..25b76a0 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
@@ -123,6 +123,10 @@
//鍙傛暟閿欒
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()));
+ pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()));
+ pricingDetail.setUnitTime(Constants.formatIntegerNum(pricingDetail.getUnitTime()));
+ pricingDetail.setHolidayUnitTime(Constants.formatIntegerNum(pricingDetail.getHolidayUnitTime()));
if ( pricingDetail.getBaseTime() < 0){
pricingDetail.setBaseTime(-1);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index c4dfad8..8fac0ca 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -106,7 +106,7 @@
pageWrap.getModel().setStatus(Constants.TWO);
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Refund> queryWrapper = initQueryParamByModel(pageWrap.getModel());
- queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCreatorName())
,SystemUser::getRealname
,pageWrap.getModel().getCreatorName());
IPage<Refund> refundIPage = refundJoinMapper.selectJoinPage(page, Refund.class, queryWrapper);
@@ -175,6 +175,7 @@
queryWrapper.like(model.getPayOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getPayOnlineOrderid());
queryWrapper.like(model.getOnlineOrderid() !=null,Refund::getOnlineOrderid,model.getOnlineOrderid());
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
+ queryWrapper.like(model.getCreatorName() !=null,SystemUser::getRealname,model.getCreatorName());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(Refund::getDoneDate);
return queryWrapper;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index 0b0d5fc..5542746 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -33,6 +33,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
/**
@@ -349,8 +350,7 @@
//鍙兘鍚屾鏄ㄥぉ10涔嬪墠鐨勬暟鎹�
Calendar caln = Calendar.getInstance();
caln.setTime(ydate);
-// System.out.println(caln.get(Calendar.HOUR_OF_DAY) );
- if(caln.get(Calendar.HOUR_OF_DAY) <= 10){
+ if(caln.get(Calendar.HOUR_OF_DAY) > 10){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈�杩戝悓姝ユ椂闂村彧鑳芥埅姝㈠埌鏄ㄥぉ10鐐瑰墠锛�");
}
}
@@ -410,12 +410,14 @@
//璁＄畻鑷杞︽敹鍏ワ紝鍖归厤鏉ヨ嚜鑷杞﹀皬绋嬪簭鐨勬墍鏈夋敮浠樻垚鍔熷拰閫�娆炬垚鍔熺殑閲戦锛屼綔涓鸿嚜琛岃溅鏀跺叆锛堢疮璁℃敹娆鹃噾棰�-绱閫�娆炬垚鍔熼噾棰濓級
if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayService.getConfig().getAppId())){
//鑷杞︽敹鍏ョ疮璁℃敹娆鹃噾棰�(鏀粯鎴愬姛鎬婚噾棰�-閫�娆炬�婚噾棰濓級
- if(StringUtils.equals(detail.getBillType(),"SUCCESS")){
+ if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
//濡傛灉鏄氦鏄�
bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
- }else if(StringUtils.equals(info.getTradeType(),"REFUND" )){
+ bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
+ }else if(StringUtils.equals(info.getTradeState(),"REFUND" )){
//濡傛灉閫�娆炬垚鍔燂紝鎵ｉ櫎閫�娆鹃噾棰�
- bill.setBikeFee(bill.getBikeFee().subtract(detail.getApplyRefundFee()));
+ bill.setBikeFee(bill.getBikeFee().subtract(detail.getRefundFee()) );
+ bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
}
}
--
Gitblit v1.9.3