zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2023-12-13 13:19:22 +08:00
parent fa036179b1
commit ecaaf81dcf
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -363,6 +363,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
wrapper.selectAll(BuyOrder.class);
wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,BuyOrder::getUserId);
wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus());
wrapper.eq(BuyOrder::getOrderType,"order");
wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime());
wrapper.lt(requestVo.getEndTime()!=null,BuyOrder::getCreateTime,requestVo.getEndTime());
wrapper.orderByDesc(BuyOrder::getCreateTime);

10
src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java
View File

@@ -57,6 +57,16 @@ public class ExpressFeeServiceImpl extends ServiceImpl<ExpressFeeDao, ExpressFee
addWF = new BigDecimal(0);
}
flag = addWF.add(new BigDecimal(24));
} else if (regionCode.startsWith("54")) {//西藏
BigDecimal addWF ;
if(weight.compareTo(new BigDecimal(1))>0){
addWF = (weight.subtract(new BigDecimal(1))).multiply(new BigDecimal(19));
}else {
addWF = new BigDecimal(0);
}
flag = addWF.add(new BigDecimal(25));
} else{
int weightInterval;
BigDecimal additionalWeight;

4
src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
List<String> list1 = Arrays.asList("甲", "丙", "戊", "庚", "壬");
//确定阳日或阴日
Integer cs;
if(list1.contains(day.charAt(0))){
if(list1.contains(Character.toString(day.charAt(0)))){
cs = 9;
}else {
cs = 6;
@@ -206,7 +206,7 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
}else {
kx = y;
}
String s = lgbf_d[kx];
String s = lgbf_d[kx-1];
String k;
if(s== "公孙"){
k="内关";