小么熊🐻 2 жил өмнө
parent
commit
f543bb033d

+ 0 - 1
nbjk-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -111,7 +111,6 @@ public class OrderInfo extends BaseBusinessEntity{
 
 
 
-
     /** 手机类型 1:苹果 2:安卓 */
     @Excel(name = "手机类型 1:苹果 2:安卓")
     @TableField("phone_type")

+ 6 - 1
nbjk-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="successTime"    column="success_time"    />
         <result property="payType"    column="pay_type"    />
         <result property="phoneType"    column="phone_type"    />
+        <result property="foreType"    column="fore_type"    />
+        <result property="refundReason"    column="refund_reason"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
@@ -37,7 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outRefundNo != null and outRefundNo != '' "> and status = #{status}</if>
             <if test="total != null "> and total = #{total}</if>
             <if test="tradeType != null and tradeType != ''  "> and trade_type = #{tradeType}</if>
-            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+            <if test="unionId != null and unionId != ''  "> and union_id = #{unionId}</if>
+            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
+
+
             <if test="startTime != null and startTime != '' ">
                 and DATE_FORMAT(success_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{startTime}
             </if>