fix
This commit is contained in:
parent
618e4fe146
commit
a928c49d3c
|
|
@ -28,6 +28,7 @@ Controller
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/file")
|
@RequestMapping("/file")
|
||||||
public class FileInfoController extends BaseController
|
public class FileInfoController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import com.bonus.zlpt.common.log.annotation.Log;
|
||||||
import com.bonus.zlpt.common.log.enums.BusinessType;
|
import com.bonus.zlpt.common.log.enums.BusinessType;
|
||||||
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
||||||
import com.bonus.zlpt.equip.api.domain.HotSearch;
|
import com.bonus.zlpt.equip.api.domain.HotSearch;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
@ -27,6 +28,7 @@ import com.bonus.zlpt.equip.service.IHotSearchService;
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Api(tags = "装备浏览量接口")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/search")
|
@RequestMapping("/search")
|
||||||
public class HotSearchController extends BaseController
|
public class HotSearchController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import com.bonus.zlpt.common.log.annotation.Log;
|
||||||
import com.bonus.zlpt.common.log.enums.BusinessType;
|
import com.bonus.zlpt.common.log.enums.BusinessType;
|
||||||
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
||||||
import com.bonus.zlpt.equip.api.domain.LeaseInfo;
|
import com.bonus.zlpt.equip.api.domain.LeaseInfo;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
@ -27,6 +28,7 @@ import com.bonus.zlpt.equip.service.ILeaseInfoService;
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Api(tags = "装备租赁数据接口")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/lease")
|
@RequestMapping("/lease")
|
||||||
public class LeaseInfoController extends BaseController
|
public class LeaseInfoController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import com.bonus.zlpt.common.log.annotation.Log;
|
||||||
import com.bonus.zlpt.common.log.enums.BusinessType;
|
import com.bonus.zlpt.common.log.enums.BusinessType;
|
||||||
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
||||||
import com.bonus.zlpt.equip.api.domain.TypeInfo;
|
import com.bonus.zlpt.equip.api.domain.TypeInfo;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
@ -21,15 +22,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import com.bonus.zlpt.equip.service.ITypeInfoService;
|
import com.bonus.zlpt.equip.service.ITypeInfoService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设备类型Controller
|
* 设备类型Controller
|
||||||
*
|
*
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Api(tags = "装备类型接口")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/type")
|
@RequestMapping("/type")
|
||||||
public class TypeInfoController extends BaseController
|
public class TypeInfoController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ import com.bonus.zlpt.equip.service.ITypeInfoRecordService;
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/record")
|
@RequestMapping("/record")
|
||||||
public class TypeInfoRecordController extends BaseController
|
public class TypeInfoRecordController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ import com.bonus.zlpt.equip.api.domain.UpOff;
|
||||||
import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
|
import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
|
||||||
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
|
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
|
||||||
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
|
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
@ -32,6 +33,7 @@ Controller
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Api(tags = "装备上下架接口")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/off")
|
@RequestMapping("/off")
|
||||||
public class UpOffController extends BaseController
|
public class UpOffController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
|
||||||
import com.bonus.zlpt.common.security.utils.SecurityUtils;
|
import com.bonus.zlpt.common.security.utils.SecurityUtils;
|
||||||
import com.bonus.zlpt.equip.api.domain.UserCollect;
|
import com.bonus.zlpt.equip.api.domain.UserCollect;
|
||||||
import com.bonus.zlpt.system.api.model.LoginUser;
|
import com.bonus.zlpt.system.api.model.LoginUser;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
|
@ -33,6 +34,7 @@ Controller
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-02
|
* @date 2023-12-02
|
||||||
*/
|
*/
|
||||||
|
@Api(tags = "收藏装备接口")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/collect")
|
@RequestMapping("/collect")
|
||||||
public class UserCollectController extends BaseController
|
public class UserCollectController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
|
||||||
* @author xsheng
|
* @author xsheng
|
||||||
* @date 2023-12-01
|
* @date 2023-12-01
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/details")
|
@RequestMapping("/details")
|
||||||
public class OrderDetailsController extends BaseController
|
public class OrderDetailsController extends BaseController
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
|
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
|
||||||
select d.*,o.code,o.time as order_time,o.order_status
|
-- select d.*,o.code,o.time as order_time,o.order_status
|
||||||
|
-- from ma_order_info o
|
||||||
|
-- left join ma_order_details d on d.order_id = o.order_id
|
||||||
|
-- where o.order_id = #{orderId}
|
||||||
|
select d.*,o.code,o.time as order_time,o.order_status,s.file_url as contract_url
|
||||||
from ma_order_info o
|
from ma_order_info o
|
||||||
left join ma_order_details d on d.order_id = o.order_id
|
left join ma_order_details d on d.order_id = o.order_id
|
||||||
where o.order_id = #{orderId}
|
left join sys_file_info s on s.model_id = o.order_id
|
||||||
|
where o.order_id = #{orderId} and s.dic_id = 21
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
|
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue