xiugai

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -105,7 +105,7 @@ public class ElectronicMembershipCardController {
                             //充值优惠类型
                             if(cardDetail.getSettingRuleType().equals("1")){ //按充值金额
                                 BigDecimal presentAmt = cardDetail.getPresentAmt(); //当前赠送金额
-                                if(dctime !=null){
+                                if(cardRechargeSettingList.get(0).getDiscountTimeSetting().equals("1") && dctime !=null){
                                     for (String str : dctime){
                                         if(str.contains(currentTime)){  //如果当前时间在会员日活动时间内
                                             //计算会员日内的总赠送积分
@@ -120,7 +120,7 @@ public class ElectronicMembershipCardController {
                                 customerCardUseRecord.setPresentAmt(presentAmt);
                             }else if(cardDetail.getSettingRuleType().equals("2")){      //按充值金额的比例
                                 BigDecimal presentAmt = amt.multiply(cardDetail.getPresentAmt().divide(new BigDecimal(100))); //当前赠送金额比例的赠送积分
-                                if(dctime !=null){
+                                if(cardRechargeSettingList.get(0).getDiscountTimeSetting().equals("1") && dctime !=null){
                                     for (String str : dctime){
                                         if(str.contains(currentTime)){  //如果当前时间在会员日活动时间内
                                             //计算会员日期内的总赠送积分

YijiaRestful/src/main/java/com/platform/yijia/pojo/CustomerCardSetting.java

@@ -12,6 +12,7 @@ import java.util.List;
 public class CustomerCardSetting {
     private Integer id;
     private String cardOilsType;            //电子充值卡油类类型：1.柴油；2.汽油；
+    private String discountTimeSetting;     //会员活动设置（0.禁用，1.启用）
     private String discountTime;        //会员日活动时间
     private String presentScale;          //赠送比例
     private String isDiscountCoupon;    //是否可以使用优惠券：0，否；1，是

YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -39,6 +39,7 @@
     <resultMap id="CardSettingBaseResultMap" type="com.platform.yijia.pojo.CustomerCardSetting">
         <id     column="id"                         jdbcType="INTEGER"    property="id" />
         <result column="card_oils_type"             jdbcType="VARCHAR"    property="cardOilsType" />
+        <result column="discount_time_setting"      jdbcType="VARCHAR"    property="discountTimeSetting" />
         <result column="discount_time"              jdbcType="VARCHAR"    property="discountTime" />
         <result column="present_scale"              jdbcType="VARCHAR"    property="presentScale" />
         <result column="is_discount_coupon"         jdbcType="VARCHAR"    property="isDiscountCoupon" />
@@ -63,6 +64,7 @@
         SELECT
             T1.id,
             T1.card_oils_type,
+            T1.discount_time_setting,
             T1.discount_time,
             T1.present_scale,
             T1.is_discount_coupon,