This commit is contained in:
van
2026-04-09 01:11:23 +08:00
parent 16bcd45c63
commit a2c4589046
10 changed files with 739 additions and 31 deletions

View File

@@ -14,6 +14,21 @@
<result property="modifyTime" column="modify_time"/>
<result property="productId" column="product_id"/>
<result property="itemId" column="item_id"/>
<result property="goodsTitle" column="goods_title"/>
<result property="goodsImageUrl" column="goods_image_url"/>
<result property="buyerNick" column="buyer_nick"/>
<result property="payAmount" column="pay_amount"/>
<result property="detailWaybillNo" column="detail_waybill_no"/>
<result property="detailExpressCode" column="detail_express_code"/>
<result property="detailExpressName" column="detail_express_name"/>
<result property="receiverName" column="receiver_name"/>
<result property="receiverMobile" column="receiver_mobile"/>
<result property="receiverAddress" column="receiver_address"/>
<result property="receiverRegion" column="receiver_region"/>
<result property="recvProvName" column="recv_prov_name"/>
<result property="recvCityName" column="recv_city_name"/>
<result property="recvAreaName" column="recv_area_name"/>
<result property="recvTownName" column="recv_town_name"/>
<result property="detailJson" column="detail_json"/>
<result property="lastNotifyJson" column="last_notify_json"/>
<result property="jdOrderId" column="jd_order_id"/>
@@ -26,13 +41,17 @@
<result property="updateTime" column="update_time"/>
<result property="jdThirdPartyOrderNo" column="jd_third_party_order_no"/>
<result property="jdRemark" column="jd_remark"/>
<result property="jdAddress" column="jd_address"/>
</resultMap>
<sql id="selectJoinVo">
select e.id, e.app_key, e.seller_id, e.user_name, e.order_no, e.order_type, e.order_status, e.refund_status,
e.modify_time, e.product_id, e.item_id, e.detail_json, e.last_notify_json, e.jd_order_id, e.local_waybill_no,
e.modify_time, e.product_id, e.item_id, e.goods_title, e.goods_image_url, e.buyer_nick, e.pay_amount, e.detail_waybill_no,
e.detail_express_code, e.detail_express_name, e.receiver_name, e.receiver_mobile, e.receiver_address,
e.receiver_region, e.recv_prov_name, e.recv_city_name, e.recv_area_name, e.recv_town_name,
e.detail_json, e.last_notify_json, e.jd_order_id, e.local_waybill_no,
e.ship_status, e.ship_error, e.ship_time, e.ship_express_code, e.create_time, e.update_time,
o.third_party_order_no as jd_third_party_order_no, o.remark as jd_remark
o.third_party_order_no as jd_third_party_order_no, o.remark as jd_remark, o.address as jd_address
from erp_goofish_order e
left join jd_order o on e.jd_order_id = o.id
</sql>
@@ -68,10 +87,16 @@
<insert id="insert" parameterType="com.ruoyi.jarvis.domain.ErpGoofishOrder" useGeneratedKeys="true" keyProperty="id">
insert into erp_goofish_order
(app_key, seller_id, user_name, order_no, order_type, order_status, refund_status, modify_time, product_id, item_id,
goods_title, goods_image_url, buyer_nick, pay_amount, detail_waybill_no, detail_express_code, detail_express_name,
receiver_name, receiver_mobile, receiver_address, receiver_region,
recv_prov_name, recv_city_name, recv_area_name, recv_town_name,
detail_json, last_notify_json, jd_order_id, local_waybill_no, ship_status, ship_error, ship_time, ship_express_code,
create_time, update_time)
values
(#{appKey}, #{sellerId}, #{userName}, #{orderNo}, #{orderType}, #{orderStatus}, #{refundStatus}, #{modifyTime}, #{productId}, #{itemId},
#{goodsTitle}, #{goodsImageUrl}, #{buyerNick}, #{payAmount}, #{detailWaybillNo}, #{detailExpressCode}, #{detailExpressName},
#{receiverName}, #{receiverMobile}, #{receiverAddress}, #{receiverRegion},
#{recvProvName}, #{recvCityName}, #{recvAreaName}, #{recvTownName},
#{detailJson}, #{lastNotifyJson}, #{jdOrderId}, #{localWaybillNo}, #{shipStatus}, #{shipError}, #{shipTime}, #{shipExpressCode},
#{createTime}, #{updateTime})
</insert>
@@ -87,6 +112,21 @@
<if test="modifyTime != null">modify_time = #{modifyTime},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="itemId != null">item_id = #{itemId},</if>
<if test="goodsTitle != null">goods_title = #{goodsTitle},</if>
<if test="goodsImageUrl != null">goods_image_url = #{goodsImageUrl},</if>
<if test="buyerNick != null">buyer_nick = #{buyerNick},</if>
<if test="payAmount != null">pay_amount = #{payAmount},</if>
<if test="detailWaybillNo != null">detail_waybill_no = #{detailWaybillNo},</if>
<if test="detailExpressCode != null">detail_express_code = #{detailExpressCode},</if>
<if test="detailExpressName != null">detail_express_name = #{detailExpressName},</if>
<if test="receiverName != null">receiver_name = #{receiverName},</if>
<if test="receiverMobile != null">receiver_mobile = #{receiverMobile},</if>
<if test="receiverAddress != null">receiver_address = #{receiverAddress},</if>
<if test="receiverRegion != null">receiver_region = #{receiverRegion},</if>
<if test="recvProvName != null">recv_prov_name = #{recvProvName},</if>
<if test="recvCityName != null">recv_city_name = #{recvCityName},</if>
<if test="recvAreaName != null">recv_area_name = #{recvAreaName},</if>
<if test="recvTownName != null">recv_town_name = #{recvTownName},</if>
<if test="detailJson != null">detail_json = #{detailJson},</if>
<if test="lastNotifyJson != null">last_notify_json = #{lastNotifyJson},</if>
<if test="jdOrderId != null">jd_order_id = #{jdOrderId},</if>