submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1295,7 +1295,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                     if (ObjectUtils.isNotNull(x.getDivideType()) && x.getDivideType() == 1){
                                         x.setDivideRateStr(x.getDivideRate()+"%");
                                     }else {
-                                        x.setDivideRateStr(ObjectUtil.isNull(item.getDivideRate())?"0%":item.getDivideRate().toString());
+                                        x.setDivideRateStr(ObjectUtil.isNull(x.getDivideRate())?"0%":x.getDivideRate().toString());
                                     }
                                 }
                             } else {
@@ -4632,6 +4632,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                         topRefundUserVo.setRefundReason(item.getApplyReason());
                         topRefundUserVo.setOrderSn(orderSn);
+                        TopOldOrderGoods orderGoods1 = topOrderGoodsService.getById(item.getOrderGoodsId());
+                        topRefundUserVo.setGoodsRealPrice(orderGoods1.getGoodsRealPrice());
                         BigDecimal decimal1 = orderVo.getPretaxBrokerage();
                         if (ObjectUtils.isNotNull(decimal1) && count > 0){
                             decimal1 = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
@@ -4677,6 +4679,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                 topRefundUserVo.setRefundReason(item.getApplyReason());
                 topRefundUserVo.setOrderSn(orderSn);
+//                topRefundUserVo.setGoodsRealPrice();
                 BigDecimal decimal1 = orderVo.getPretaxBrokerage();
                 if (ObjectUtils.isNotNull(decimal1) && count > 0){
                     decimal1 = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
@@ -4695,6 +4698,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     topRefundUserVo.setBusinessName(businessName);
                     topRefundUserVo.setGoodsYear(g.getSevenYear());
                     topRefundUserVo.setGoodsPrice(g.getStandPrice());
+                    topRefundUserVo.setGoodsRealPrice(g.getStandPrice());
                 } else {
                     TopOldOrderGoods orderGoods = topOrderGoodsService.getById(item.getOrderGoodsId());
                     topRefundUserVo.setUserName(orderGoods.getUserName());
@@ -4703,6 +4707,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     topRefundUserVo.setGoodsName(orderGoods.getGoodsName());
                     topRefundUserVo.setGoodsYear(orderGoods.getGoodsYear());
                     topRefundUserVo.setGoodsPrice(orderGoods.getGoodsPrice());
+                    topRefundUserVo.setGoodsRealPrice(orderGoods.getGoodsRealPrice());
                 }
                 topRefundUserVo.setRefundSn(item.getRefundSn());
                 return topRefundUserVo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopRefundUserVo.java

@@ -38,6 +38,9 @@ public class TopRefundUserVo {
     @ApiModelProperty("商品标准价格")
     private BigDecimal goodsPrice;
 
+    @ApiModelProperty("单价")
+    private BigDecimal goodsRealPrice;
+
     @ApiModelProperty("退款金额")
     private BigDecimal refundFee;