修改导出文件bug

yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java

@@ -138,6 +138,10 @@ public class ProdComm implements Serializable{
 
     @TableField(exist = false)
     private String nickName;
+    @TableField(exist = false)
+    private String userMobile;
+    @TableField(exist = false)
+    private String channelName;
 
     @TableField(exist = false)
     private String avatar;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderRefundController.java

@@ -157,7 +157,7 @@ public class OrderRefundController {
         if (ObjectUtil.isEmpty(userId)){
             throw new GlobalException("导出获取当前登录用户信息失败,请登录");
         }
-        ExportTask exportTaskOne =  exportTaskService.findByUserIdAndStatusAndType(userId,0,1);//查询导出任务为正常订单并且在进行中的数据
+        ExportTask exportTaskOne =  exportTaskService.findByUserIdAndStatusAndType(userId,0,2);//查询导出任务为退款订单并且在进行中的数据
         // 异步执行
         if (exportTaskOne!=null){
             return R.FAIL("售后订单有导出任务正在执行中,请中断或者等待完成");

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ProdCommController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.ProdComm;
 import com.yami.shop.bean.po.CommPo;
 import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.service.ProdCommService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,22 +25,22 @@ public class ProdCommController {
 
     @GetMapping("/backendCommList")
     @ApiOperation(value = "后台管理-用户评价")
-    public ResponseEntity<IPage<ProdComm>> backendCommList(PageParam<ProdComm> page, CommPo po) {
-        return ResponseEntity.ok(prodCommService.backendCommList(page,po));
+    public R<IPage<ProdComm>> backendCommList(PageParam<ProdComm> page, CommPo po) {
+        return R.SUCCESS(prodCommService.backendCommList(page,po));
     }
 
     @GetMapping("/backendCommAudit")
     @ApiOperation(value = "后台管理-用户评价-(审核，1:通过，0:待审核， -1：不通过审核)")
-    public ResponseEntity<Void> backendCommAudit(Long prodCommId, Integer status) {
+    public R<Void> backendCommAudit(Long prodCommId, Integer status) {
         prodCommService.backendCommAudit(prodCommId,status);
-        return ResponseEntity.ok().build();
+        return R.SUCCESS();
     }
 
     @GetMapping("/reply")
     @ApiOperation(value = "后台-商家回复")
-    public ResponseEntity<Void> reply(Long prodCommId, String replyContent) {
+    public R<Void> reply(Long prodCommId, String replyContent) {
         prodCommService.reply(prodCommId,replyContent);
-        return ResponseEntity.ok().build();
+        return R.SUCCESS();
     }
 
 

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1435,7 +1435,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             // 检查是否被中断
             if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
                 log.info("导出任务 {} 被中断，已处理 {} 行", exportTask.getTaskId(), context.getProcessedRows());
-                exportTask.setExportStatus(2); // 3-已取消
+                exportTask.setExportStatus(1); // 3-已取消
                 exportTask.setExportMsg("导出被用户取消，已处理" + context.getProcessedRows() + "行");
                 exportTaskService.updateById(exportTask);
                 return;

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1517,7 +1517,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 // 检查是否被中断
                 if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
                     log.info("导出任务 {} 被中断，已处理 {} 行", exportTask.getTaskId(), context.getProcessedRows());
-                    exportTask.setExportStatus(2); // 3-已取消
+                    exportTask.setExportStatus(1); // 3-已取消
                     exportTask.setExportMsg("导出被用户取消，已处理" + context.getProcessedRows() + "行");
                     exportTaskService.updateById(exportTask);
                     return;

yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml

@@ -18,7 +18,9 @@
         <result property="isAnonymous" column="is_anonymous"/>
         <result property="status" column="status"/>
         <result property="evaluate" column="evaluate"/>
-
+        <result property="userMobile" column="user_mobile"/>
+        <result property="channelName" column="channel_name"/>
+        <result property="shopName" column="shop_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="avatar" column="avatar"/>
     </resultMap>
@@ -229,10 +231,11 @@
     </select>
 
     <select id="backendCommList" resultMap="BaseResultMap">
-        SELECT b.nick_name,b.pic avatar,a.*
+        SELECT b.nick_name,b.user_mobile,b.pic avatar,a.*,d.channel_name
         FROM tz_prod_comm a
         LEFT JOIN tz_user b on a.user_id=b.user_id
         LEFT JOIN tz_order c on a.order_number =c.order_number
+        LEFT JOIN tz_channel d on d.id =c.channel_id
         <where>
             <if test="po.score != null">
                 and a.score=#{po.score}