增加了买券功能活动价格和活动名称的配置

src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java

@@ -91,10 +91,8 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
      * 360
      */
     private BigDecimal COMMUNE_AMOUNT2 = BigDecimal.valueOf(360);
-    /**
-     * 50
-     */
-    private BigDecimal COMMUNE_AMOUNT3 = BigDecimal.valueOf(50);
+
+
 
     private static Logger logger = LoggerFactory.getLogger(CommuneOrderService.class);
 
@@ -115,11 +113,11 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
             throw new OrderException(-4, "用户不存在");
         }
         //金额不是COMMUNE_AMOUNT 或者 COMMUNE_AMOUNT2
-        if(communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT) != 0  && communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2) != 0 && communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT3) != 0){
+        if(communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT) != 0  && communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2) != 0){
         	throw new OrderException(-4, "您提交的订单金额有问题，请检查！");
         }
         //
-        if(communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT) != 0  && communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT2) != 0 && communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT3) != 0){
+        if(communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT) != 0  && communeOrderBean.getPrePayAmount().compareTo(COMMUNE_AMOUNT2) != 0){
         	throw new OrderException(-41, "您提交的预付款金额有问题，请检查！");
         }
         if(userExt.getVipGrade() == VipGradeEnum.NONEVIP.getKey() || userExt.getVipGrade() == VipGradeEnum.VIP1.getKey() ){  //新社员缴费
@@ -144,6 +142,16 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         }
         checkOrderItem(communeOrderBean);
     }
+    
+    protected void voucherCheckParameters(CommuneOrderBean communeOrderBean) {
+    	ClientConfig clientConfig = clientConfigDao.getByType("buyVoucher_voucher_send");
+    	String commune_voucher = clientConfig.getMessage();
+    	JSONObject jsobj = JSONObject.parseObject(commune_voucher);
+    	BigDecimal voucher_amount = BigDecimal.valueOf(jsobj.getInteger("price"));
+        if(communeOrderBean.getPrePayAmount().compareTo(voucher_amount) != 0){
+        	throw new OrderException(-41, "您提交的预付款金额有问题，请检查！");
+        }
+    }
 
     @Override
     protected BigDecimal getTotalAmount(CommuneOrderBean abstractOrderBean) {
@@ -196,11 +204,10 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         communeOrderBean.setLimitedEmoneyAmount(new BigDecimal(0));
         communeOrderBean.setOnPayAmount(new BigDecimal(0));
         //社员续费 add by caosy
-        if(communeOrderBean.getCommuneYears() != null && communeOrderBean.getCommuneYears() > 0){
-        	communeOrderBean.setOrderName(COMMUNE_RENEW_ORDER_NAME);
-        }else{
-        	communeOrderBean.setOrderName(COMMUNE_ORDER_NAME);
-        }
+    	ClientConfig clientConfig = clientConfigDao.getByType("buyVoucher_voucher_send");
+    	String commune_voucher = clientConfig.getMessage();
+    	JSONObject jsobj = JSONObject.parseObject(commune_voucher);
+        communeOrderBean.setOrderName(jsobj.getString("activeName"));
         if (StringUtils.isEmpty(communeOrderBean.getPayMode())) {
             communeOrderBean.setPayMode(ProductPaymentTypeEnum.PREPAY.getName());
         }
@@ -208,9 +215,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         communeOrderBean.setUnlimitedEmoneyAmount(new BigDecimal(0));
         // communeOrderBean.setOrderSource(0);
         communeOrderBean.setPreAuthAmount(new BigDecimal(0));
-        if (communeOrderBean.getOrderCategory() == null) {
-            communeOrderBean.setOrderCategory(OrderCategoryEnum.VOUCHER.getKey());
-        }
+        communeOrderBean.setOrderCategory(OrderCategoryEnum.VOUCHER.getKey());
         if (communeOrderBean.getVoucherAmount() == null) {
             communeOrderBean.setVoucherAmount(new BigDecimal(0));
         }
@@ -261,7 +266,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
     
     
     public JSONObject voucherPlaceOrderForMiniApp(CommuneOrderBean communeOrderBean) throws Exception{
-        this.checkParameters(communeOrderBean);
+        this.voucherCheckParameters(communeOrderBean);
         if (this.voucherBeforePlaceOrder(communeOrderBean)) {
             Order order = this.saveOrder(communeOrderBean);
             this.saveOrderItems(communeOrderBean, order.getOrderId());