订单历史operateMan更新

pull/1/head
zccbbg 2 years ago
parent 83a51b812e
commit 1bc8a15f49

@ -1,6 +1,5 @@
package com.cyl.h5.controller; package com.cyl.h5.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cyl.h5.pojo.dto.ApplyRefundDTO; import com.cyl.h5.pojo.dto.ApplyRefundDTO;
import com.cyl.h5.pojo.dto.OrderCreateDTO; import com.cyl.h5.pojo.dto.OrderCreateDTO;
@ -13,10 +12,8 @@ import com.cyl.h5.pojo.vo.H5OrderVO;
import com.cyl.h5.pojo.vo.OrderCalcVO; import com.cyl.h5.pojo.vo.OrderCalcVO;
import com.cyl.h5.pojo.vo.form.OrderSubmitForm; import com.cyl.h5.pojo.vo.form.OrderSubmitForm;
import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5OrderService;
import com.cyl.manager.oms.domain.Order;
import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.Member;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.core.redis.RedisService;
import com.ruoyi.framework.config.LocalDataUtil; import com.ruoyi.framework.config.LocalDataUtil;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -27,8 +24,6 @@ import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController @RestController
@RequestMapping("/h5/order") @RequestMapping("/h5/order")
@Slf4j @Slf4j
@ -59,10 +54,6 @@ public class H5OrderController {
} }
} }
} }
// @PostMapping("orders")
// public ResponseEntity<Page<OrderVO>> queryOrderPage(@RequestBody OrderH5Query query, Pageable pageReq) {
// return ResponseEntity.ok(service.queryOrderPage(query, pageReq));
// }
@ApiOperation("下单前校验") @ApiOperation("下单前校验")
@PostMapping("/addOrderCheck") @PostMapping("/addOrderCheck")

@ -220,7 +220,7 @@ public class H5OrderService {
OrderOperateHistory orderOperateHistory = new OrderOperateHistory(); OrderOperateHistory orderOperateHistory = new OrderOperateHistory();
orderOperateHistory.setOrderId(orderId); orderOperateHistory.setOrderId(orderId);
orderOperateHistory.setOrderSn(order.getOrderSn()); orderOperateHistory.setOrderSn(order.getOrderSn());
orderOperateHistory.setOperateMan(member.getId() + ""); orderOperateHistory.setOperateMan(member.getNickname());
orderOperateHistory.setOrderStatus(Constants.OrderStatus.NOTPAID); orderOperateHistory.setOrderStatus(Constants.OrderStatus.NOTPAID);
orderOperateHistory.setCreateTime(optTime); orderOperateHistory.setCreateTime(optTime);
orderOperateHistory.setCreateBy(member.getId()); orderOperateHistory.setCreateBy(member.getId());

Loading…
Cancel
Save