平台券，指定商品，满减折扣券

店铺券，指定商品所有券

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java

@@ -3,24 +3,18 @@ package com.liquidnet.service.order.utils;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.param.BackCouponParam;
-import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinBackOrder;
 import com.liquidnet.service.goblin.entity.GoblinBackOrderLog;
-import com.liquidnet.service.goblin.entity.GoblinOrderOperationLog;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
-import com.liquidnet.service.goblin.entity.GoblinOrderSku;
-import com.liquidnet.service.goblin.param.CouponCanUse2Param;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -29,7 +23,6 @@ import org.springframework.util.MultiValueMap;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -266,13 +259,13 @@ public class GoblinOrderUtils {
                                     returnVo.setValue(vo.getValFace());
                                     returnVo.setCouType(vo.getType());
                                 } else if (vo.getType().equals("2")) {//折扣
-                                    BigDecimal tempPrice = totalPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                                    BigDecimal tempPrice = contentPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP);
                                     if (tempPrice.compareTo(vo.getDeduction()) > 0) {
                                         tempPrice = vo.getDeduction();
                                     }
                                     returnVo.setValue(tempPrice);
                                     returnVo.setCouType(vo.getType());
-                                } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减
+                                } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(contentPrice) <= 0) {//满减
                                     returnVo.setValue(vo.getValMinus());
                                     returnVo.setCouType(vo.getType());
                                 }