bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-07 16:04:20 +08:00
parent 618e4fe146
commit a928c49d3c
9 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/FileInfoController.java
View File

@ -28,6 +28,7 @@ Controller
* @author xsheng
* @date 2023-12-02
*/
@Deprecated
@RestController
@RequestMapping("/file")
public class FileInfoController extends BaseController

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/HotSearchController.java
View File

@ -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.security.annotation.RequiresPermissions;
import com.bonus.zlpt.equip.api.domain.HotSearch;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -27,6 +28,7 @@ import com.bonus.zlpt.equip.service.IHotSearchService;
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "装备浏览量接口")
@RestController
@RequestMapping("/search")
public class HotSearchController extends BaseController

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/LeaseInfoController.java
View File

@ -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.security.annotation.RequiresPermissions;
import com.bonus.zlpt.equip.api.domain.LeaseInfo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -27,6 +28,7 @@ import com.bonus.zlpt.equip.service.ILeaseInfoService;
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "装备租赁数据接口")
@RestController
@RequestMapping("/lease")
public class LeaseInfoController extends BaseController

5
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java
View File

@ -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.security.annotation.RequiresPermissions;
import com.bonus.zlpt.equip.api.domain.TypeInfo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
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 com.bonus.zlpt.equip.service.ITypeInfoService;
/**
* 设备类型Controller
*
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "装备类型接口")
@RestController
@RequestMapping("/type")
public class TypeInfoController extends BaseController

1
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoRecordController.java
View File

@ -27,6 +27,7 @@ import com.bonus.zlpt.equip.service.ITypeInfoRecordService;
* @author xsheng
* @date 2023-12-02
*/
@Deprecated
@RestController
@RequestMapping("/record")
public class TypeInfoRecordController extends BaseController

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UpOffController.java
View File

@ -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.vo.DevInfoVo;
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -32,6 +33,7 @@ Controller
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "装备上下架接口")
@RestController
@RequestMapping("/off")
public class UpOffController extends BaseController

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java
View File

@ -15,6 +15,7 @@ import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.equip.api.domain.UserCollect;
import com.bonus.zlpt.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -33,6 +34,7 @@ Controller
* @author xsheng
* @date 2023-12-02
*/
@Api(tags = "收藏装备接口")
@RestController
@RequestMapping("/collect")
public class UserCollectController extends BaseController

1
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
View File

@ -34,6 +34,7 @@ import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
* @author xsheng
* @date 2023-12-01
*/
@Deprecated
@RestController
@RequestMapping("/details")
public class OrderDetailsController extends BaseController

11
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -44,10 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<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
left join ma_order_details d on d.order_id = o.order_id
where o.order_id = #{orderId}
left join ma_order_details d on d.order_id = o.order_id
left join sys_file_info s on s.model_id = o.order_id
where o.order_id = #{orderId} and s.dic_id = 21
</select>
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">