Merge branch 'dev_coupon' into pre

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

@@ -122,7 +122,7 @@ public class GoblinOrderUtils {
                             for (GoblinOrderSku skuOrderVo : goblinOrderSkuList) {
                                 String orderVoSpuId = skuOrderVo.getSpuId();
                                 String pre = GoblinStatusConst.MarketPreStatus.getPre(orderVoSpuId);
-                                if(pre!=null){
+                                if (pre != null) {
                                     orderVoSpuId = orderVoSpuId.split(pre)[0];
                                 }
                                 if (targetId.equals(orderVoSpuId)) {
@@ -131,9 +131,9 @@ public class GoblinOrderUtils {
                             }
                         }
                     }
-                    if(targetPrice.compareTo(value)>=0) {
+                    if (targetPrice.compareTo(value) >= 0) {
                         voucher = voucher.add(value);
-                    }else{
+                    } else {
                         voucher = voucher.add(targetPrice);
                     }
                     break;
@@ -145,7 +145,7 @@ public class GoblinOrderUtils {
                             for (GoblinOrderSku skuOrderVo : goblinOrderSkuList) {
                                 String orderVoSpuId = skuOrderVo.getSpuId();
                                 String pre = GoblinStatusConst.MarketPreStatus.getPre(orderVoSpuId);
-                                if(pre!=null){
+                                if (pre != null) {
                                     orderVoSpuId = orderVoSpuId.split(pre)[0];
                                 }
                                 if (targetId.equals(orderVoSpuId)) {
@@ -263,7 +263,7 @@ public class GoblinOrderUtils {
                                 if (tempPrice.compareTo(vo.getDeduction()) > 0) {
                                     tempPrice = vo.getDeduction();
                                 }
-                                returnVo.setValue(tempPrice);
+                                returnVo.setValue(totalPrice.subtract(tempPrice));
                                 returnVo.setCouType(vo.getType());
                             } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减
                                 returnVo.setValue(vo.getValMinus());