Merge branches 'feature/20210806_积分商城重构_wuping' and 'qa' of…

Merge branches 'feature/20210806_积分商城重构_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/entities/dto/product/pointsmall/IntegralProductType.java

@@ -59,7 +59,7 @@ public class IntegralProductType {
     private Integer levelType;
 
 //    @ApiModelProperty(value = "会员等级列表")
-    private List<String> levelList;
+//    private List<Object> levelList;
 
 //    @ApiModelProperty(value = "商品排序值")
     private Integer sequence;

order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java

@@ -489,16 +489,16 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             request.setPayChannelName("储值卡支付");
         }
         //积分价格
-        Integer integralPrice = productBean.getIntegralPrice() == null ? 0 : productBean.getIntegralPrice();
+//        Integer integralPrice = productBean.getIntegralPrice() == null ? 0 : productBean.getIntegralPrice();
         //现金价格（分）
         Integer cashPrice = productBean.getCashPrice() == null ? 0 : productBean.getCashPrice();
-        Integer settlementAmount = integralPrice + cashPrice;
+//        Integer settlementAmount = integralPrice + cashPrice;
         //订单原始金额，单位分
         //用户在界面上看到的支付金额
-        request.setSettlementAmount(settlementAmount.longValue());
+        request.setSettlementAmount(cashPrice.longValue());
         //实际支付现金金额，扣除支付自生优惠，单位分`
         request.setActualPayAmount(cashPrice.longValue());
-        request.setOriginalAmount(settlementAmount.longValue());
+        request.setOriginalAmount(cashPrice.longValue());
         request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
         //商品信息赋值
         OrderItemCreateReq orderItemCreateReq = convent2OrderItemCreateReq(productBean, partnerId, skuId, active);