add:积分订单

fs-company/src/main/java/com/fs/hisStore/controller/FsIntegralOrderController.java

@@ -15,12 +15,14 @@ import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsIntegralGoods;
 import com.fs.his.domain.FsIntegralOrder;
+import com.fs.his.domain.FsIntegralOrderLogs;
 import com.fs.his.dto.ExpressInfoDTO;
 import com.fs.his.enums.ShipperCodeEnum;
 import com.fs.his.mapper.FsIntegralGoodsMapper;
 import com.fs.his.param.FsIntegralOrderCreateParam;
 import com.fs.his.param.FsIntegralOrderParam;
 import com.fs.his.service.IFsExpressService;
+import com.fs.his.service.IFsIntegralOrderLogsService;
 import com.fs.his.service.IFsIntegralOrderService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.FsIntegralOrderListVO;
@@ -53,6 +55,9 @@ public class FsIntegralOrderController extends BaseController
 
     @Autowired
     private FsIntegralGoodsMapper fsIntegralGoodsMapper;
+
+    @Autowired
+    private IFsIntegralOrderLogsService fsIntegralOrderLogsService;
     /**
      * 查询积分商品订单列表
      */
@@ -147,16 +152,7 @@ public class FsIntegralOrderController extends BaseController
         return R.ok().put("userPhone",userPhone);
     }
 
-    /**
-     * 新增积分商品订单
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:add')")
-    @Log(title = "积分商品订单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public R add(@RequestBody FsIntegralOrderCreateParam param)
-    {
-        return fsIntegralOrderService.createOrder(param);
-    }
+
 
     /**
      * 修改积分商品订单
@@ -170,13 +166,17 @@ public class FsIntegralOrderController extends BaseController
     }
 
     /**
-     * 删除积分商品订单
+     * 根据订单ID查询操作记录
      */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:remove')")
-    @Log(title = "积分商品订单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
+//    @PreAuthorize("@ss.hasPermi('his:logs:query')")
+    @GetMapping("/order/{orderId}")
+    public AjaxResult getLogsByOrderId(@PathVariable("orderId") Long orderId)
     {
-        return toAjax(fsIntegralOrderService.deleteFsIntegralOrderByOrderIds(orderIds));
+        FsIntegralOrderLogs queryParam = new FsIntegralOrderLogs();
+        queryParam.setOrderId(orderId);
+        List<FsIntegralOrderLogs> list = fsIntegralOrderLogsService.selectFsIntegralOrderLogsList(queryParam);
+        return AjaxResult.success(list);
     }
+
+
 }

fs-service/src/main/java/com/fs/his/domain/FsIntegralOrderLogs.java

@@ -1,5 +1,6 @@
 package com.fs.his.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 订单操作记录对象 fs_integral_order_logs
@@ -37,7 +39,8 @@ public class FsIntegralOrderLogs{
     private String changeMessage;
 
     /** 操作时间 */
-    private LocalDateTime changeTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date changeTime;
 
     /** 操作员 */
     @Excel(name = "操作员")