电子卡充值消费

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardSettingController.java

@@ -8,6 +8,7 @@ import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -123,7 +124,14 @@ public class CustomerCardSettingController extends BaseController
     {
         return toAjax(customerCardSettingService.deleteCustomerCardSettingByIds(ids));
     }
+
+    /**
+     * 查询油站电子卡规则设置
+     * @param customerCardSetting
+     * @return
+     */
     @GetMapping(value = "/selectCustomerCardSetting")
+    @Transactional
     public AjaxResult selectCustomerCardSetting(CustomerCardSetting customerCardSetting)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerCardSetting.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 客户电子会员卡充值优惠设置对象 customer_card_setting
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
@@ -48,10 +48,6 @@ public class CustomerCardSetting extends BaseEntity
     @Excel(name = "油站ID")
     private Long stationId;
 
-    /** 油站名称 */
-    @Excel(name = "油站名称")
-    private String stationName;
-
     private String isGradeSetting;
 
     private String isMarket;
@@ -95,79 +91,79 @@ public class CustomerCardSetting extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setCardOilsType(String cardOilsType) 
+    public void setCardOilsType(String cardOilsType)
     {
         this.cardOilsType = cardOilsType;
     }
 
-    public String getCardOilsType() 
+    public String getCardOilsType()
     {
         return cardOilsType;
     }
-    public void setDiscountTimeSetting(String discountTimeSetting) 
+    public void setDiscountTimeSetting(String discountTimeSetting)
     {
         this.discountTimeSetting = discountTimeSetting;
     }
 
-    public String getDiscountTimeSetting() 
+    public String getDiscountTimeSetting()
     {
         return discountTimeSetting;
     }
-    public void setDiscountTime(String discountTime) 
+    public void setDiscountTime(String discountTime)
     {
         this.discountTime = discountTime;
     }
 
-    public String getDiscountTime() 
+    public String getDiscountTime()
     {
         return discountTime;
     }
-    public void setPresentScale(String presentScale) 
+    public void setPresentScale(String presentScale)
     {
         this.presentScale = presentScale;
     }
 
-    public String getPresentScale() 
+    public String getPresentScale()
     {
         return presentScale;
     }
-    public void setIsDiscountCoupon(String isDiscountCoupon) 
+    public void setIsDiscountCoupon(String isDiscountCoupon)
     {
         this.isDiscountCoupon = isDiscountCoupon;
     }
 
-    public String getIsDiscountCoupon() 
+    public String getIsDiscountCoupon()
     {
         return isDiscountCoupon;
     }
-    public void setEnjoyIntegralMultiple(String enjoyIntegralMultiple) 
+    public void setEnjoyIntegralMultiple(String enjoyIntegralMultiple)
     {
         this.enjoyIntegralMultiple = enjoyIntegralMultiple;
     }
 
-    public String getEnjoyIntegralMultiple() 
+    public String getEnjoyIntegralMultiple()
     {
         return enjoyIntegralMultiple;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerCardSettingDetail.java

@@ -8,7 +8,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户电子会员卡充值优惠设置明细对象 customer_card_setting_detail
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
@@ -28,7 +28,7 @@ public class CustomerCardSettingDetail extends BaseEntity
     private String settingRuleType;
     private BigDecimal discountAmtStart;
     private BigDecimal discountAmtEnd;
-    private String oilName;
+    private String cardType;
     private String status;
     private String cardOilsType;
     private String discountTimeSetting;
@@ -39,6 +39,14 @@ public class CustomerCardSettingDetail extends BaseEntity
     private String presentScale;
     private String enjoyIntegralMultiple;
 
+    public String getCardType() {
+        return cardType;
+    }
+
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
     public String getEnjoyIntegralMultiple() {
         return enjoyIntegralMultiple;
     }
@@ -111,14 +119,6 @@ public class CustomerCardSettingDetail extends BaseEntity
         this.status = status;
     }
 
-    public String getOilName() {
-        return oilName;
-    }
-
-    public void setOilName(String oilName) {
-        this.oilName = oilName;
-    }
-
     public BigDecimal getDiscountAmtStart() {
         return discountAmtStart;
     }
@@ -139,39 +139,39 @@ public class CustomerCardSettingDetail extends BaseEntity
     @Excel(name = "赠送金额值或者赠送c充值金额的比例")
     private BigDecimal presentAmt;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setParentId(Long parentId) 
+    public void setParentId(Long parentId)
     {
         this.parentId = parentId;
     }
 
-    public Long getParentId() 
+    public Long getParentId()
     {
         return parentId;
     }
-    public void setSettingRuleType(String settingRuleType) 
+    public void setSettingRuleType(String settingRuleType)
     {
         this.settingRuleType = settingRuleType;
     }
 
-    public String getSettingRuleType() 
+    public String getSettingRuleType()
     {
         return settingRuleType;
     }
-    public void setPresentAmt(BigDecimal presentAmt) 
+    public void setPresentAmt(BigDecimal presentAmt)
     {
         this.presentAmt = presentAmt;
     }
 
-    public BigDecimal getPresentAmt() 
+    public BigDecimal getPresentAmt()
     {
         return presentAmt;
     }
@@ -187,6 +187,7 @@ public class CustomerCardSettingDetail extends BaseEntity
             .append("discountAmtEnd", getDiscountAmtEnd())
             .append("presentAmt", getPresentAmt())
             .append("status", getStatus())
+            .append("cardType", getCardType())
             .toString();
     }
 }

yijia-customer/src/main/java/com/yijia/customer/service/ICustomerCardSettingService.java

@@ -5,15 +5,15 @@ import com.yijia.customer.domain.CustomerCardSetting;
 
 /**
  * 客户电子会员卡充值优惠设置Service接口
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
-public interface ICustomerCardSettingService 
+public interface ICustomerCardSettingService
 {
     /**
      * 查询客户电子会员卡充值优惠设置
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置ID
      * @return 客户电子会员卡充值优惠设置
      */
@@ -21,16 +21,21 @@ public interface ICustomerCardSettingService
 
     /**
      * 查询客户电子会员卡充值优惠设置列表
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 客户电子会员卡充值优惠设置集合
      */
     public List<CustomerCardSetting> selectCustomerCardSettingList(CustomerCardSetting customerCardSetting);
+    /**
+     * 查询油站电子卡规则设置
+     * @param customerCardSetting
+     * @return
+     */
     public CustomerCardSetting selectCustomerCardSetting(CustomerCardSetting customerCardSetting);
 
     /**
      * 新增客户电子会员卡充值优惠设置
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 结果
      */
@@ -38,7 +43,7 @@ public interface ICustomerCardSettingService
 
     /**
      * 修改客户电子会员卡充值优惠设置
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 结果
      */
@@ -46,7 +51,7 @@ public interface ICustomerCardSettingService
 
     /**
      * 批量删除客户电子会员卡充值优惠设置
-     * 
+     *
      * @param ids 需要删除的客户电子会员卡充值优惠设置ID
      * @return 结果
      */
@@ -54,7 +59,7 @@ public interface ICustomerCardSettingService
 
     /**
      * 删除客户电子会员卡充值优惠设置信息
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置ID
      * @return 结果
      */

yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerCardSettingServiceImpl.java

@@ -13,12 +13,12 @@ import com.yijia.customer.service.ICustomerCardSettingService;
 
 /**
  * 客户电子会员卡充值优惠设置Service业务层处理
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
 @Service
-public class CustomerCardSettingServiceImpl implements ICustomerCardSettingService 
+public class CustomerCardSettingServiceImpl implements ICustomerCardSettingService
 {
     @Autowired
     private CustomerCardSettingMapper customerCardSettingMapper;
@@ -27,7 +27,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
 
     /**
      * 查询客户电子会员卡充值优惠设置
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置ID
      * @return 客户电子会员卡充值优惠设置
      */
@@ -39,7 +39,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
 
     /**
      * 查询客户电子会员卡充值优惠设置列表
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 客户电子会员卡充值优惠设置
      */
@@ -50,23 +50,39 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
         return customerCardSettingMapper.selectCustomerCardSettingList(customerCardSetting);
     }
 
+    /**
+     * 查询油站电子卡规则设置
+     * @param customerCardSetting
+     * @return
+     */
     @Override
     public CustomerCardSetting selectCustomerCardSetting(CustomerCardSetting customerCardSetting)
     {
-
-        CustomerCardSetting setting =customerCardSettingMapper.selectCustomerCardSetting(customerCardSetting);
+        CustomerCardSetting setting=customerCardSettingMapper.selectCustomerCardSetting(customerCardSetting);
         if(setting!=null){
             CustomerCardSettingDetail detail = new CustomerCardSettingDetail();
             detail.setParentId(setting.getId());
             List<CustomerCardSettingDetail> detailList =customerCardSettingDetailMapper.selectCustomerCardSettingDetailList(detail);
+            if(detailList==null ){
+                CustomerCardSettingDetail cardSettingDetail = new CustomerCardSettingDetail();
+                detailList.add(cardSettingDetail);
+            }
             setting.setDetailList(detailList);
+        }else{
+            setting =new  CustomerCardSetting();
+            setting.setIsGradeSetting("1");
+            setting.setIsDiscountCoupon("1");
+            setting.setIsMarket("1");
+            setting.setEnjoyIntegralMultiple("1");
+            setting.setPresentScale("0");
+            setting.setDiscountTimeSetting("1");
         }
         return setting;
     }
 
     /**
      * 新增客户电子会员卡充值优惠设置
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 结果
      */
@@ -87,7 +103,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
 
     /**
      * 修改客户电子会员卡充值优惠设置
-     * 
+     *
      * @param customerCardSetting 客户电子会员卡充值优惠设置
      * @return 结果
      */
@@ -110,7 +126,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
 
     /**
      * 批量删除客户电子会员卡充值优惠设置
-     * 
+     *
      * @param ids 需要删除的客户电子会员卡充值优惠设置ID
      * @return 结果
      */
@@ -122,7 +138,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
 
     /**
      * 删除客户电子会员卡充值优惠设置信息
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置ID
      * @return 结果
      */

yijia-customer/src/main/resources/mapper/customer/CustomerCardSettingDetailMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="discountAmtStart"    column="discount_amt_start"    />
         <result property="discountAmtEnd"    column="discount_amt_end"    />
         <result property="presentAmt"    column="present_amt"    />
-        <result property="oilName"    column="oil_name"    />
+        <result property="cardType"    column="car_type"    />
         <result property="status"    column="status"    />
         <result property="cardOilsType"    column="card_oils_type"    />
         <result property="discountTimeSetting"    column="discount_time_setting"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCustomerCardSettingDetailVo">
-        select id, parent_id, setting_rule_type, discount_amt_start,discount_amt_end, present_amt,oil_name,status from customer_card_setting_detail
+        select id, parent_id, setting_rule_type, discount_amt_start,discount_amt_end, present_amt,car_type,status from customer_card_setting_detail
     </sql>
 
     <select id="selectCustomerCardSettingDetailList" parameterType="CustomerCardSettingDetail" resultMap="CustomerCardSettingDetailResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>
             <if test="discountAmtEnd != null "> and discount_amt_end = #{discountAmtEnd}</if>
             <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>
-            <if test="oilName != null "> and oil_name = #{oilName}</if>
+            <if test="cardType != null "> and car_type = #{cardType}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="stationIdList != null ">
                 and station_id in
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listDetailInfo" parameterType="CustomerCardSetting" resultMap="CustomerCardSettingDetailResult">
-        SELECT a.setting_rule_type,a.discount_amt_start,a.discount_amt_end,a.present_amt,oil_name,b.card_oils_type,
+        SELECT a.setting_rule_type,a.discount_amt_start,a.discount_amt_end,a.present_amt,car_type,b.card_oils_type,
         b.discount_time_setting,b.discount_time_type,b.is_discount_coupon,b.is_market,b.is_grade_setting,b.present_scale,b.enjoy_integral_multiple
         from customer_card_setting_detail a join customer_card_setting b on a.parent_id= b.id
         <where>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>-->
 <!--            <if test="discountAmtEnd != null "> and discount_amt_end = #{discountAmtEnd}</if>-->
 <!--            <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>-->
-<!--            <if test="oilName != null "> and oil_name = #{oilName}</if>-->
+<!--            <if test="cardType != null "> and car_type = #{cardType}</if>-->
 <!--            <if test="status != null "> and status = #{status}</if>-->
             <if test="stationIdList != null ">
                 and station_id in
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null">discount_amt_start,</if>
             <if test="discountAmtEnd != null">discount_amt_end,</if>
             <if test="presentAmt != null">present_amt,</if>
-            <if test="oilName != null">oil_name,</if>
+            <if test="cardType != null">car_type,</if>
             <if test="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null">#{discountAmtStart},</if>
             <if test="discountAmtEnd != null">#{discountAmtEnd},</if>
             <if test="presentAmt != null">#{presentAmt},</if>
-            <if test="oilName != null">#{oilName},</if>
+            <if test="cardType != null">#{cardType},</if>
             <if test="status != null">#{status},</if>
          </trim>
     </insert>
@@ -107,8 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null">discount_amt_start = #{discountAmtStart},</if>
             <if test="discountAmtEnd != null">discount_amt_end = #{discountAmtEnd},</if>
             <if test="presentAmt != null">present_amt = #{presentAmt},</if>
-            <if test="oilName != null">#{oilName},</if>
-            <if test="status != null">#{status},</if>
+            <if test="cardType != null">car_type = #{cardType},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>
             <if test="discountAmtEnd != null "> and discount_amt_end = #{discountAmtEnd}</if>
             <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>
-            <if test="oilName != null"> and oil_name = #{oilName}</if>
+            <if test="cardType != null"> and car_type = #{cardType}</if>
             <if test="status != null"> and status = #{status}</if>
         </where>
     </delete>