diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index e83137e8..8ae36871 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -363,6 +363,7 @@ public class BuyOrderServiceImpl extends ServiceImpl 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); diff --git a/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java index 03920d99..18a47bbc 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java @@ -57,7 +57,17 @@ public class ExpressFeeServiceImpl extends ServiceImpl0){ + 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; if (weight.compareTo(new BigDecimal(0)) >= 0 && weight.compareTo(new BigDecimal(3)) < 0) { diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java index 2f51b609..b1fbe770 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java @@ -187,7 +187,7 @@ public class PointServiceImpl extends ServiceImpl impleme List 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 impleme }else { kx = y; } - String s = lgbf_d[kx]; + String s = lgbf_d[kx-1]; String k; if(s== "公孙"){ k="内关";