caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2022-04-20 17:54:21 +08:00
commit f0d6938127
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
View File

@ -12,7 +12,7 @@ import lombok.Data;
@Data
public class EvaluationNumberVO {
@ApiModelProperty(value = "全部商品")
@ApiModelProperty(value = "全部评价")
private Integer all;
@ApiModelProperty(value = "好评数量")

2
framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java
View File

@ -38,7 +38,7 @@ public interface MemberEvaluationMapper extends BaseMapper<MemberEvaluation> {
* @param goodsId 商品ID
* @return 会员评价
*/
@Select("select grade,count(1) as num from li_member_evaluation Where goods_id=#{goodsId} and status='OPEN' GROUP BY grade")
@Select("select grade,count(1) as num from li_member_evaluation Where goods_id=#{goodsId} and status='OPEN' and delete_flag = false GROUP BY grade")
List<Map<String, Object>> getEvaluationNumber(String goodsId);
/**

6
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
View File

@ -180,6 +180,12 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
storeFlow.setFinalPrice(afterSale.getActualRefundPrice());
//最终结算金额 =店铺流水金额+店铺单品返现支出金额+平台收取佣金金额
storeFlow.setBillPrice(CurrencyUtil.add(storeFlow.getFinalPrice(), storeFlow.getDistributionRebate(), storeFlow.getCommissionPrice()));
//站点优惠券佣金
storeFlow.setSiteCouponCommission(payStoreFlow.getSiteCouponCommission());
//平台优惠券 使用金额
storeFlow.setSiteCouponPrice(payStoreFlow.getSiteCouponPrice());
//站点优惠券佣金比例
storeFlow.setSiteCouponPoint(payStoreFlow.getSiteCouponPoint());
//退款日志
RefundLog refundLog = refundLogService.queryByAfterSaleSn(afterSale.getSn());
//第三方流水单号

2
framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java
View File

@ -51,6 +51,6 @@ public interface BillMapper extends BaseMapper<Bill> {
*/
@Select("SELECT SUM( final_price ) AS refundPrice,SUM( commission_price ) AS refundCommissionPrice" +
",SUM( distribution_rebate ) AS distributionRefundCommission,SUM( site_coupon_commission ) AS siteCouponRefundCommission" +
",SUM( bill_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
",SUM( final_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
Bill getRefundBill(@Param(Constants.WRAPPER) QueryWrapper<Bill> queryWrapper);
}

12
framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
View File

@ -103,7 +103,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
//分销订单退还，返现佣金返还
bill.setDistributionRefundCommission(refundBill.getDistributionRefundCommission());
//退货平台优惠券补贴返还
bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission());
bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission()!=null?refundBill.getSiteCouponRefundCommission():0D);
//退款金额=店铺最终退款结算金额
refundPrice = refundBill.getBillPrice();
}
@ -132,16 +132,16 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
bill.setPointSettlementPrice(orderBill.getPointSettlementPrice());
//砍价商品结算价格
bill.setKanjiaSettlementPrice(orderBill.getKanjiaSettlementPrice());
//入款结算金额= 店铺支付结算金额 + 平台优惠券补贴 + 退单产生退还佣金金额 + 分销订单退还，返现佣金返还+退货平台优惠券补贴返还
//入款结算金额= 店铺支付结算金额 + 平台优惠券补贴 + 分销订单退还，返现佣金返还+退单产生退还佣金金额
orderPrice = CurrencyUtil.add(orderBill.getBillPrice(),
bill.getSiteCouponCommission(),
bill.getRefundCommissionPrice(),
bill.getDistributionRefundCommission(),
bill.getSiteCouponRefundCommission());
bill.getRefundCommissionPrice());
}
//最终结算金额=入款结算金额-退款结算金额-
Double finalPrice = CurrencyUtil.sub(orderPrice, refundPrice);
//最终结算金额=入款结算金额-退款结算金额-退货平台优惠券补贴返还
Double finalPrice = CurrencyUtil.sub(orderPrice, refundPrice,bill.getSiteCouponRefundCommission());
//店铺最终结算金额=最终结算金额
bill.setBillPrice(finalPrice);