|
|
|
@ -6,7 +6,7 @@ |
|
|
|
<insert id="add" parameterType="com.example.demo.domain.entity.CashRecord" |
|
|
|
useGeneratedKeys="true" keyProperty="id"> |
|
|
|
insert into |
|
|
|
cash_record(order_type,jwcode,name,market,activity, |
|
|
|
cash_record_collection(order_type,jwcode,name,market,activity, |
|
|
|
order_code,goods_name,good_num,num_unit,permanent_gold,free_gold, |
|
|
|
payment_currency,payment_amount,received_market, |
|
|
|
pay_type,pay_time,status,submitter_id,submitter_market, |
|
|
|
@ -29,58 +29,58 @@ |
|
|
|
|
|
|
|
<!--更新订单状态--> |
|
|
|
<update id="updateStatus"> |
|
|
|
update cash_record |
|
|
|
update cash_record_collection |
|
|
|
set status=#{status} |
|
|
|
where order_code=#{orderCode} |
|
|
|
</update> |
|
|
|
<!--更新订单--> |
|
|
|
<update id="updateByOrderCode"> |
|
|
|
UPDATE cash_record |
|
|
|
UPDATE cash_record_collection |
|
|
|
<set> |
|
|
|
jwcode = #{cashRecord.jwcode}, |
|
|
|
name = #{cashRecord.name}, |
|
|
|
market = #{cashRecord.market}, |
|
|
|
activity = #{cashRecord.activity}, |
|
|
|
goods_name = #{cashRecord.goodsName}, |
|
|
|
good_num = #{cashRecord.goodNum}, |
|
|
|
num_unit = #{cashRecord.NumUnit}, |
|
|
|
permanent_gold = #{cashRecord.permanentGold}, |
|
|
|
free_gold = #{cashRecord.freeGold}, |
|
|
|
Num_unit = #{cashRecord.NumUnit}, |
|
|
|
payment_currency = #{cashRecord.paymentCurrency}, |
|
|
|
payment_amount = #{cashRecord.paymentAmount}, |
|
|
|
received_market = #{cashRecord.receivedMarket}, |
|
|
|
pay_type = #{cashRecord.payType}, |
|
|
|
pay_time = #{cashRecord.payTime}, |
|
|
|
voucher = #{cashRecord.voucher}, |
|
|
|
remark = #{cashRecord.remark}, |
|
|
|
jwcode = #{cashRecordCollection.jwcode}, |
|
|
|
name = #{cashRecordCollection.name}, |
|
|
|
market = #{cashRecordCollection.market}, |
|
|
|
activity = #{cashRecordCollection.activity}, |
|
|
|
goods_name = #{cashRecordCollection.goodsName}, |
|
|
|
good_num = #{cashRecordCollection.goodNum}, |
|
|
|
num_unit = #{cashRecordCollection.NumUnit}, |
|
|
|
permanent_gold = #{cashRecordCollection.permanentGold}, |
|
|
|
free_gold = #{cashRecordCollection.freeGold}, |
|
|
|
Num_unit = #{cashRecordCollection.NumUnit}, |
|
|
|
payment_currency = #{cashRecordCollection.paymentCurrency}, |
|
|
|
payment_amount = #{cashRecordCollection.paymentAmount}, |
|
|
|
received_market = #{cashRecordCollection.receivedMarket}, |
|
|
|
pay_type = #{cashRecordCollection.payType}, |
|
|
|
pay_time = #{cashRecordCollection.payTime}, |
|
|
|
voucher = #{cashRecordCollection.voucher}, |
|
|
|
remark = #{cashRecordCollection.remark}, |
|
|
|
status = 0, |
|
|
|
</set> |
|
|
|
WHERE order_code = #{cashRecord.orderCode} |
|
|
|
WHERE order_code = #{cashRecordCollection.orderCode} |
|
|
|
AND status = 5 |
|
|
|
</update> |
|
|
|
<!--补全手续费等字段--> |
|
|
|
<update id="complete"> |
|
|
|
UPDATE cash_record |
|
|
|
UPDATE cash_record_collection |
|
|
|
<set> |
|
|
|
<if test="cashRecord.handlingCharge != null "> |
|
|
|
handling_charge = #{cashRecord.handlingCharge}, |
|
|
|
handling_charge = #{cashRecordCollection.handlingCharge}, |
|
|
|
</if> |
|
|
|
<if test="cashRecord.receivedCurrency != null and cashRecord.receivedCurrency != ''"> |
|
|
|
received_currency = #{cashRecord.receivedCurrency}, |
|
|
|
received_currency = #{cashRecordCollection.receivedCurrency}, |
|
|
|
</if> |
|
|
|
<if test="cashRecord.receivedAmount != null and cashRecord.receivedAmount != ''"> |
|
|
|
received_amount = #{cashRecord.receivedAmount}, |
|
|
|
received_amount = #{cashRecordCollection.receivedAmount}, |
|
|
|
</if> |
|
|
|
<if test="cashRecord.receivedTime != null"> |
|
|
|
received_time = #{cashRecord.receivedTime}, |
|
|
|
received_time = #{cashRecordCollection.receivedTime}, |
|
|
|
</if> |
|
|
|
<if test="cashRecord.paymentCurrency != null and cashRecord.paymentCurrency != ''"> |
|
|
|
payment_currency = #{cashRecord.paymentCurrency}, |
|
|
|
payment_currency = #{cashRecordCollection.paymentCurrency}, |
|
|
|
</if> |
|
|
|
<!-- 关键：null 就不拼这一列 --> |
|
|
|
<if test="cashRecord.paymentAmount != null"> |
|
|
|
payment_amount = #{cashRecord.paymentAmount}, |
|
|
|
payment_amount = #{cashRecordCollection.paymentAmount}, |
|
|
|
</if> |
|
|
|
<!-- 只有 这些字段全部非空才更新状态 --> |
|
|
|
status = CASE |
|
|
|
@ -95,7 +95,7 @@ |
|
|
|
ELSE status |
|
|
|
END |
|
|
|
</set> |
|
|
|
WHERE order_code = #{cashRecord.orderCode} |
|
|
|
WHERE order_code = #{cashRecordCollection.orderCode} |
|
|
|
AND status IN (1, 3) |
|
|
|
</update> |
|
|
|
<!--设置gOrder订单为已同步--> |
|
|
|
@ -131,7 +131,7 @@ |
|
|
|
cr.audit_id,cr.create_time,cr.update_time,cr.audit_time, |
|
|
|
a1.admin_name as submitterName, |
|
|
|
a2.admin_name as auditName |
|
|
|
from cash_record cr |
|
|
|
from cash_record_collection cr |
|
|
|
left join admin a1 on cr.submitter_id = a1.id |
|
|
|
left join admin a2 on cr.audit_id = a2.id |
|
|
|
left join market m1 on m1.id = cr.market |
|
|
|
@ -213,11 +213,11 @@ |
|
|
|
</choose> |
|
|
|
</select> |
|
|
|
<select id="selectAuditByOrderCode" resultType="com.example.demo.domain.entity.CashRecord"> |
|
|
|
select cash_record.id,jwcode,name,market,ra.activity_name as activity, |
|
|
|
select crc.id,jwcode,name,market,ra.activity_name as activity, |
|
|
|
order_code,bank_code,goods_name,good_num,num_unit,permanent_gold,free_gold, |
|
|
|
payment_currency,payment_amount,pay_type,pay_time,cash_record.status,submitter_id, |
|
|
|
payment_currency,payment_amount,pay_type,pay_time,crc.status,submitter_id, |
|
|
|
voucher,remark |
|
|
|
from cash_record |
|
|
|
from cash_record_collection crc |
|
|
|
left join recharge_activity ra on ra.id = cash_record.activity |
|
|
|
where order_code=#{orderCode} |
|
|
|
</select> |
|
|
|
@ -249,7 +249,7 @@ |
|
|
|
cr.pay_type,cr.received_market,cr.pay_time,cr.received_time,cr.audit_id,cr.status,cr.submitter_id, |
|
|
|
cr.submitter_market,cr.voucher,cr.remark,cr.audit_time,a1.admin_name as submitterName, |
|
|
|
a2.admin_name as auditName,ra.activity_name as activity |
|
|
|
from cash_record cr |
|
|
|
from cash_record_collection cr |
|
|
|
left join admin a1 on cr.submitter_id = a1.id |
|
|
|
left join admin a2 on cr.audit_id = a2.id |
|
|
|
left join recharge_activity ra on ra.id = cr.activity |
|
|
|
|
lijianlin
2 weeks ago