xiugai

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

@@ -427,6 +427,7 @@ public class ElectronicMembershipCardController {
                     customerElectronicCard.setAmt(new BigDecimal(amt));
                 }
                 customerElectronicCard.setRecentlyTime(new Date());
+                customerElectronicCard.setCardOilsType(customerCardUseRecordInfo.getCardOilsType());
                 electronicMembershipCardService.updateElectronicCardInfoByUnionId(customerElectronicCard);
                 customerCardUseRecord.setStatus("1");
                 customerCardUseRecord.setBalance(customerElectronicCard.getAmt());

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

@@ -496,6 +496,9 @@
             <if test="unionId !=null and unionId != ''">
                 union_id = #{unionId}
             </if>
+            <if test="cardOilsType !='' and cardOilsType != null" >
+                AND card_oils_type = #{cardOilsType}
+            </if>
             <if test="stationId !='' and stationId != null" >
                 AND station_id = #{stationId}
             </if>