Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of…

Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1053,8 +1053,8 @@ public class OrderAdapter {
                     if (OrderAccountType.CUSTOMER_SUB.getCode().equals(accountBean.getType())) {
                         customerScoreAmount = accountBean.getPrice() < 0 ? 0 - accountBean.getPrice() : accountBean.getPrice();
                         DecimalFormat decimalFormat = new DecimalFormat("#.00");
-                        String customerScoreAmountStr = decimalFormat.format(customerScoreAmount / 100.0);
-                        customerScorePrompt = "积分抵扣-¥" + customerScoreAmountStr;
+                        customerScorePrompt = decimalFormat.format(customerScoreAmount / 100.0);
+//                        customerScorePrompt = "积分抵扣-¥" + customerScoreAmountStr;
                     }
                 }
             }