FIX: 售后修复

fs-service-system/src/main/java/com/fs/erp/dto/ErpRefundUpdateRequest.java

@@ -6,8 +6,13 @@ import java.io.Serializable;
 
 @Data
 public class ErpRefundUpdateRequest implements Serializable {
-    String tid;//平台单号
-    String oid;//子订单号
-    Integer refund_state;//0:未退款 1:退款完成 2:退款中
+    private String tid;//平台单号
+    private String oid;//子订单号
+    private Integer refund_state;//0:未退款 1:退款完成 2:退款中
+
+    /**
+     * 订单状态
+     */
+    private Integer orderStatus;
 
 }

fs-service-system/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -459,10 +459,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
     public BaseResponse refundUpdateLive(ErpRefundUpdateRequest param) {
         LiveOrder fsStoreOrder = liveorderMapper.selectLiveOrderByOrderCode(param.getTid());
 
-        FsStoreDelivers byOrderCode = fsStoreDeliversMapper.findByOrderCode(fsStoreOrder.getOrderCode());
-
-        // 发货后退款
-        if(ObjectUtil.isNotNull(byOrderCode)){
+        // 如果不是待发货
+        if(ObjectUtil.notEqual(param.getOrderStatus(), 2)){
 
         } else {
             // 如果是发货前退款，直接走取消订单流程

fs-service-system/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -421,7 +421,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R applyAfterSales(String uesrId, LiveAfterSalesApplyParam param) {
         LiveOrder order = liveOrderService.selectLiveOrderByOrderId(String.valueOf(param.getOrderId()));
         if (!order.getUserId().equals(uesrId)) {
@@ -535,7 +535,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         request.setTid(order.getOrderCode());
         request.setOid(order.getOrderCode());
         request.setRefund_state(1);
-        LiveAfterSales liveAfterSales = baseMapper.selectLiveAfterSalesByOrderId(storeAfterSales.getOrderId());
+        request.setOrderStatus(order.getStatus());
 
 
         // 根据仓库code找erp
@@ -556,7 +556,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
 
 
 
-        BaseResponse response=erpOrderService.refundUpdate(request);
+        BaseResponse response=erpOrderService.refundUpdateLive(request);
         if(response.getSuccess()){
             return R.ok();
         }

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -861,6 +861,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
+            request.setOrderStatus(order.getStatus());
 
             // 根据仓库code找erp
             if(StringUtils.isNotBlank(order.getStoreHouseCode())){
@@ -988,7 +989,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         payment.setPayment(order.getPayMoney().doubleValue());
         if(order.getPayTime()!=null){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String timeString = sdf.format(order.getPayTime());
+            String timeString = order.getPayTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
             Date date = sdf.parse(timeString); // 时间格式转为时间戳
             long timeLong = date.getTime();
             payment.setPaytime(new Timestamp(timeLong));
@@ -1141,7 +1142,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
         if(order.getPayTime()!=null){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String format = sdf.format(order.getPayTime());
+            String format = order.getPayTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
             remarkDTO.setPayTime(format);
         }
         erpOrder.setSeller_memo(erpOrder.getSeller_memo()+JSONUtil.toJsonStr(remarkDTO));

fs-user-app/src/main/java/com/fs/app/controller/LiveAfterSalesController.java

@@ -21,8 +21,10 @@ import com.fs.live.vo.LiveAfterSalesListUVO;
 import com.fs.live.vo.LiveOrderItemListUVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sun.media.jfxmedia.logging.Logger;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.List;
 
-
+@Slf4j
 @Api("售后接口")
 @RestController
 @RequestMapping(value="/app/live/storeAfterSales")
@@ -50,6 +52,8 @@ public class LiveAfterSalesController extends  AppBaseController {
     @ApiOperation("获取订单项列表")
     @GetMapping("/getStoreOrderItems")
     public R getStoreOrderItems(@RequestParam("orderId") Long orderId, HttpServletRequest request){
+        log.info("获取订单项列表，订单号：{}", orderId);
+
         List<LiveOrderItemListUVO> list=itemService.selectLiveOrderItemListUVOByOrderId(orderId);
         LiveOrder order=orderService.selectLiveOrderByOrderId(String.valueOf(orderId));
         order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
@@ -63,6 +67,8 @@ public class LiveAfterSalesController extends  AppBaseController {
     @ApiOperation(value = "申请售后", notes = "申请售后")
     @RepeatSubmit
     public R applyAfterSales(@RequestBody LiveAfterSalesApplyParam param) {
+        log.info("申请售后，用户ID：{}，参数：{}", getUserId(), param);
+
         return storeAfterSalesService.applyAfterSales(getUserId(), param);
     }
     @Login
@@ -70,12 +76,16 @@ public class LiveAfterSalesController extends  AppBaseController {
     @ApiOperation(value = "撤销售后", notes = "撤销售后")
     @RepeatSubmit
     public R revoke(@RequestBody LiveAfterSalesRevokeParam param) throws ParseException {
+        log.info("撤销售后，用户ID：{}，参数：{}", getUserId(), param);
+
         return storeAfterSalesService.revoke(getUserId(), param);
     }
     @Login
     @PostMapping("/addDelivery")
     @ApiOperation(value = "提交物流信息", notes = "提交物流信息")
     public R addDelivery(@Validated @RequestBody LiveAfterSalesDeliveryParam param) {
+        log.info("提交物流信息，参数：{}", param);
+
         param.setUserId(Long.parseLong(getUserId()));
         return storeAfterSalesService.addDelivery(param);
     }
@@ -85,6 +95,8 @@ public class LiveAfterSalesController extends  AppBaseController {
     @GetMapping("/getStoreAfterSalesList")
     @ApiOperation(value = "获取售后列表", notes = "获取售后列表")
     public R getStoreAfterSalesList(LiveAfterSalesListUParam param) {
+        log.info("获取售后列表，用户ID：{}，参数：{}", getUserId(), param);
+
         param.setUserId(Long.parseLong(getUserId()));
         PageHelper.startPage(Integer.parseInt(ServletUtils.getParameter("pageNum")) ,Integer.parseInt(ServletUtils.getParameter("pageSize")) );        List<LiveAfterSalesListUVO> list=storeAfterSalesService.selectLiveAfterSalesListUVO(param);
         PageInfo<LiveAfterSalesListUVO> listPageInfo=new PageInfo<>(list);
@@ -94,6 +106,8 @@ public class LiveAfterSalesController extends  AppBaseController {
     @GetMapping("/getStoreAfterSalesById")
     @ApiOperation(value = "获取售后详情", notes = "获取售后详情")
     public R getStoreAfterSalesById(@RequestParam("id") Long id) {
+        log.info("获取售后详情，售后ID：{}", id);
+
         LiveAfterSales sales=storeAfterSalesService.selectLiveAfterSalesById(id);
         LiveAfterSalesItem map=new LiveAfterSalesItem();
         map.setAfterSalesId(id);