yangdamao il y a 1 an
Parent
commit
0de91a45c1

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputServiceImpl.java

@@ -329,6 +329,7 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     bean.setGoodsBusiness(orderLIst.getEducationName() + orderLIst.getProjectName() + orderLIst.getBusinessName());
                     bean.setOrderStatus(getOrderStatus(orderLIst.getOrderStatus()));
                     bean.setRefundStatus(getRefundStatus(orderLIst.getRefundStatus()));
+                    bean.setOfflineRefundStr(orderLIst.getOfflineRefundSign() == 1 ? "是":"否");
                     if (!ObjectUtils.isEmpty(orderLIst.getInvoiceStatus())){
                         bean.setInvoiceStatus(getInvoiceStatus(orderLIst.getInvoiceStatus()));
                     }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListImportVo.java

@@ -129,6 +129,11 @@ public class OrderListImportVo {
     @Excel(name = "退款状态")
     @ApiModelProperty("退款状态")
     private String refundStatus;
+
+    @Excel(name = "是否线下退款")
+    @ApiModelProperty("是否线下退款")
+    private String offlineRefundStr;
+
     @Excel(name = "发票状态")
     @ApiModelProperty("发票状态")
     private String invoiceStatus;

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -260,4 +260,7 @@ public class OrderListVo {
 
     @ApiModelProperty("经办人订单编号")
     private String handleOrderSn;
+
+    @ApiModelProperty("是否线下退款标识:0否 1是")
+    private Integer offlineRefundSign;
 }

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
         <result property="handleOrderSn" column="handle_order_sn"/>
+        <result property="offlineRefundSign" column="offline_refund_sign"/>
     </resultMap>
 
     <select id="getGradePeriod" parameterType="Map" resultType="integer">
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.rebuy_order_goods_id,
             og.order_goods_id,
             og.goods_real_price,
+            og.offline_refund_sign,
             u.telphone,
             u.realname,
             u.id_card,