luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改用户充值接口、修改刷卡记录接口

Browse Source
This commit is contained in:
ALEI_ALEI 2024-12-21 14:55:01 +08:00
parent da62663bb0
commit 664cc4e3bf
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
View File

@ -176,6 +176,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate()); ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate());
ngUserRechargeRecords.setStatus(0); ngUserRechargeRecords.setStatus(0);
ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode())); ngUserRechargeRecords.setAreaCode(String.valueOf(rechargecardUser.getAreacode()));
ngUserRechargeRecords.setSerialNumber(rechargecardUser.getDeviceNumber());
// 计算新的余额 // 计算新的余额
// BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance()); // BigDecimal newBalance = rechargecardUser.getAmount().add(info.getBalance());

33
fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml
View File

@ -44,7 +44,8 @@
<where> <where>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
<if test="deviceNumber != null and deviceNumber != ''"> and device_number = #{deviceNumber}</if> <if test="deviceNumber != null and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
<if test="cardNumber != null and cardNumber != ''"> and card_number = #{cardNumber}</if> <!--<if test="cardNumber != null and cardNumber != ''"> and card_number = #{cardNumber}</if>-->
<if test="cardNumber != null and cardNumber != ''"> and card_number LIKE CONCAT('%',#{cardNumber},'%')</if>
<if test="projectId != null "> and project_id = #{projectId}</if> <if test="projectId != null "> and project_id = #{projectId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="billingType != null "> and billing_type = #{billingType}</if> <if test="billingType != null "> and billing_type = #{billingType}</if>
@ -78,11 +79,33 @@
card_number = #{cardNumber} card_number = #{cardNumber}
</select> </select>
<select id="selectUserConsumptionDetailsSwipListByCardNumber" parameterType="String" resultMap="UserConsumptionDetailsResult"> <select id="selectUserConsumptionDetailsSwipListByCardNumber" parameterType="UserConsumptionDetails" resultMap="UserConsumptionDetailsResult">
<include refid="selectUserConsumptionDetailsVo"/> <include refid="selectUserConsumptionDetailsVo"/>
where <where>
card_number = #{cardNumber} <if test="userId != null "> and user_id = #{userId}</if>
and billing_type=1 <if test="deviceNumber != null and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
<if test="cardNumber != null and cardNumber != ''"> and card_number = #{cardNumber}</if>
<!--<if test="cardNumber != null and cardNumber != ''"> and card_number LIKE CONCAT('%',#{cardNumber},'%')</if>-->
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="billingType != null "> and billing_type = #{billingType}</if>
<if test="pumpTime != null "> and pump_time = #{pumpTime}</if>
<if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
<if test="totalPrice != null "> and total_price = #{totalPrice}</if>
<if test="discount != null "> and discount = #{discount}</if>
<if test="taxAmount != null "> and tax_amount = #{taxAmount}</if>
<if test="amountDue != null "> and amount_due = #{amountDue}</if>
<if test="billingPeriodUnit != null "> and billing_period_unit = #{billingPeriodUnit}</if>
<if test="billingPeriodDuration != null "> and billing_period_duration = #{billingPeriodDuration}</if>
<if test="billingDate != null "> and billing_date = #{billingDate}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="paymentStatus != null "> and payment_status = #{paymentStatus}</if>
<if test="paymentMethod != null "> and payment_method = #{paymentMethod}</if>
<if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
<if test="status != null "> and status = #{status}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
</where>
</select> </select>
<insert id="insertUserConsumptionDetails" parameterType="UserConsumptionDetails" useGeneratedKeys="true" keyProperty="id"> <insert id="insertUserConsumptionDetails" parameterType="UserConsumptionDetails" useGeneratedKeys="true" keyProperty="id">