Rental(update)

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -4,6 +4,7 @@ import com.mmc.oms.common.publicinterface.Send;
 import com.mmc.oms.common.publicinterface.Take;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.model.dto.order.OrderInfoDTO;
+import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.model.qo.OrderInfoQO;
 import com.mmc.oms.model.vo.order.LeaseOrderVO;
 import com.mmc.oms.model.vo.order.OrderVcuVO;
@@ -28,6 +29,14 @@ public class RentalOrdersController extends BaseController {
     @Autowired
     private RentalOrdersService rentalOrdersService;
 
+    @ApiOperation(value = "订单状态-字典")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = TranStatusDicDTO.class)})
+    @GetMapping("listTranStatus")
+    public ResultBody listTranStatus() {
+        return ResultBody.success(rentalOrdersService.listTranStatus());
+    }
+
+
     @ApiOperation(value = "web/小程序 租赁-下单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
     @PostMapping("feignAddLease")

src/main/java/com/mmc/oms/dao/RentalOrdersDao.java

@@ -3,6 +3,7 @@ package com.mmc.oms.dao;
 import com.mmc.oms.entity.coupon.CouponDO;
 import com.mmc.oms.entity.coupon.CouponUserDO;
 import com.mmc.oms.entity.order.*;
+import com.mmc.oms.entity.transtatus.TranStatusDicDO;
 import com.mmc.oms.model.qo.OrderInfoQO;
 import com.mmc.oms.model.vo.order.OrderStatusVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -56,4 +57,6 @@ public interface RentalOrdersDao {
     OrderRefundDO getApplicationInformation(Integer id);
 
     CouponDO couponMoney(Integer couponId);
+
+    List<TranStatusDicDO> listTranStatus();
 }

src/main/java/com/mmc/oms/entity/transtatus/TranStatusDicDO.java

@@ -22,8 +22,10 @@ public class TranStatusDicDO implements Serializable {
     private String doing;
     private String waiting;
     private Integer sort;
+    private String leaseOrderStatus;
 
     public TranStatusDicDTO buildTranStatusDicDTO() {
-        return TranStatusDicDTO.builder().status(this.status).doing(this.doing).waiting(this.waiting).build();
+        return TranStatusDicDTO.builder().status(this.status).doing(this.doing).waiting(this.waiting)
+                .leaseOrderStatus(this.leaseOrderStatus).build();
     }
 }

src/main/java/com/mmc/oms/model/dto/transtatus/TranStatusDicDTO.java

@@ -24,4 +24,5 @@ public class TranStatusDicDTO implements Serializable {
     private String status;
     private String doing;
     private String waiting;
+    private String leaseOrderStatus;
 }

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -23,6 +23,7 @@ import com.mmc.oms.model.dto.order.OrderReceiptDTO;
 import com.mmc.oms.model.dto.order.OrderRefundDTO;
 import com.mmc.oms.model.dto.order.SkuOrderDTO;
 import com.mmc.oms.model.dto.repo.RepoAccountDTO;
+import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.model.dto.user.BaseAccountDTO;
 import com.mmc.oms.model.dto.user.UserAccountSimpleDTO;
 import com.mmc.oms.model.qo.OrderInfoQO;
@@ -547,6 +548,13 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
 
 
     @Override
+    public List<TranStatusDicDTO> listTranStatus() {
+        return rentalOrdersDao.listTranStatus().stream().map(d -> {
+            return d.buildTranStatusDicDTO();
+        }).collect(Collectors.toList());
+    }
+
+    @Override
     public ResultBody pfConfirmOrderWare(BaseAccountDTO cuser, OrderVcuVO param) {
         // 密码认证
         ResultBody body = passwordAuthentication(cuser, param.getAuthPwd());

src/main/java/com/mmc/oms/service/RentalOrdersService.java

@@ -2,12 +2,15 @@ package com.mmc.oms.service;
 
 import com.mmc.oms.common.result.PageResult;
 import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.model.dto.user.BaseAccountDTO;
 import com.mmc.oms.model.qo.OrderInfoQO;
 import com.mmc.oms.model.vo.order.LeaseOrderVO;
 import com.mmc.oms.model.vo.order.OrderVcuVO;
 import com.mmc.oms.model.vo.order.ReturnWareVO;
 
+import java.util.List;
+
 /**
  * @Author small @Date 2023/5/26 10:52 @Version 1.0
  */
@@ -33,4 +36,6 @@ public interface RentalOrdersService {
     ResultBody returnOrderWare(ReturnWareVO param);
 
     ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, OrderVcuVO param);
+
+    List<TranStatusDicDTO> listTranStatus();
 }

src/main/resources/mapper/RentalOrdersDao.xml

@@ -637,4 +637,19 @@
         where is_del = false
           and id = #{couponId}
     </select>
+
+    <resultMap id="tranStatusResultMap"
+               type="com.mmc.oms.entity.transtatus.TranStatusDicDO">
+        <id property="id" column="id"/>
+        <result property="status" column="status"/>
+        <result property="doing" column="doing"/>
+        <result property="waiting" column="waiting"/>
+        <result property="sort" column="sort"/>
+        <result property="leaseOrderStatus" column="lease_order_status"/>
+    </resultMap>
+    <select id="listTranStatus" resultMap="tranStatusResultMap">
+        select t.id, t.`status`, t.doing, t.waiting, t.lease_order_status
+        from tran_status_dic t
+        order by t.sort asc
+    </select>
 </mapper>