a_bazu
/
cloud-market
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev2'

dev2
Aaaaaaaa 2024-09-03 20:15:23 +08:00
parent 434b4adbac f4e61343da
commit d512b6f1a0
6 changed files with 176 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-market-server/src/main/java/com/muyu/cloud/market/controller/AliPayController.java
View File

@ -64,7 +64,7 @@ public class AliPayController {
System.out.println("买家付款时间: " + params.get("gmt_payment"));
System.out.println("买家付款金额: " + params.get("buyer_pay_amount"));
// 更新订单未已支付
ordersMapper.updateState(tradeNo, "已支付", gmtPayment, alipayTradeNo);
// ordersMapper.updateByordersState1()
}
}
return "success";

38
cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java
View File

@ -105,7 +105,6 @@ public class OrdersController {
return orderShowService.delByOrderId(ordersId);
}
/**
* 回显
* 根据id查内容
@ -120,6 +119,7 @@ public class OrdersController {
//导出
@GetMapping("/getOutAll")
@Operation(summary = "导出")
public void gatOutAll(HttpServletResponse response){
//创建工具类对象
ExcelUtil<Orders> excelUtil =new ExcelUtil<>(Orders.class);
@ -131,6 +131,7 @@ public class OrdersController {
//选中导出
@GetMapping("/getseleOut")
@Operation(summary = "选中导出")
public void selectOut (HttpServletResponse response,Integer[] ids){
//创建
ExcelUtil<Orders> excelUtil = new ExcelUtil<>(Orders.class);
@ -138,8 +139,43 @@ public class OrdersController {
List<Orders> list = orderShowService.getseleOut(ids);
excelUtil.exportExcel(response,list,"订单信息选中导出");
}
/**
* 订单修改支付状态1已付款后,更改该商品的销量
* （0待支付,1已付款,2未付款,3.售后(申请退款) 4.已退款）
*/
//订单修改支付状
@GetMapping("/updateByordersState1")
@Operation(summary = "订单修改支付状态=1,更改该商品的销量", description = "根据orderid修改数据库字段支付状态为1,根据productId修改数据库销量")
Result updateByordersState1ANDproductSales(@RequestParam("ordersId")Integer ordersId,@RequestParam("productId")Integer productId){
return orderShowService.updateByordersState1ANDproductSales(ordersId, productId);
}
@PostMapping("/updateByordersState2/{ordersId}")
@Operation(summary = "订单修改支付状态=2", description = "根据orderid修改数据库字段支付状态为2")
Result updateByordersState2(@Validated @PathVariable("ordersId") Integer ordersId) {
try {
return orderShowService.updateByordersState2(ordersId);
} catch (Exception e) {
return Result.error("更新订单状态失败：" + e.getMessage());
}
}
//3.售后(申请退款)
@PostMapping("/updateByordersState3/{ordersId}")
@Operation(summary = "订单修改支付状态=3", description = "根据orderid修改数据库字段支付状态为3")
Result updateByordersState3( @PathVariable("ordersId")Integer ordersId){
return orderShowService.updateByordersState3(ordersId);
}
// 4.已退款
@PostMapping("/updateByordersState4/{ordersId}")
@Operation(summary = "订单修改支付状态=4", description = "根据orderid修改数据库字段支付状态为4")
Result updateByordersState4(@Validated @PathVariable("ordersId")Integer ordersId){
return orderShowService.updateByordersState4(ordersId);
}
}

24
cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java
View File

@ -4,6 +4,7 @@ import com.muyu.cloud.market.domin.Orders;
import com.muyu.cloud.market.domin.req.OrdersAddReq;
import com.muyu.cloud.market.domin.req.OrdersListReq;
import com.muyu.cloud.market.domin.req.OrdersUpdReq;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -67,12 +68,31 @@ public interface OrderShowMapper {
Orders findAllById (Integer ordersId);
/**
* 订单修改支付状态1已付款后,更改该商品的销量
* （0待支付,1已付款,2未付款,3.售后(申请退款) 4.已退款）
*/
//订单修改支付状
Integer updateByordersState1(Integer ordersId);
//更改该商品的销量
Integer updateByproductSales(Integer productId);
void updateState(String tradeNo, String 已支付, String gmtPayment, String alipayTradeNo);
//修改状态为 2未付款
Integer updateByordersState2(Integer ordersId);
/**
* 订单修改支付状态后,更改该商品的销量
* 申请退款后的操作（审核表）
* @param ordersId
* @return
*/
//3.售后(申请退款--涉及到申请退款)
Integer updateByordersState3(Integer ordersId);
// 4.已退款
Integer updateByordersState4(Integer ordersId);
//导出
List<Orders> getOutAll();

24
cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java
View File

@ -2,6 +2,7 @@ package com.muyu.cloud.market.service;
import com.github.pagehelper.PageInfo;
import com.muyu.cloud.market.domin.Orders;
import com.muyu.cloud.market.domin.User;
import com.muyu.cloud.market.domin.req.OrdersAddReq;
import com.muyu.cloud.market.domin.req.OrdersListReq;
import com.muyu.cloud.market.domin.req.OrdersUpdReq;
@ -81,4 +82,27 @@ public interface OrderShowService {
List<Orders> getseleOut(Integer[] ids);
/**
* 获取登陆人信息
*/
/**
* 订单修改支付状态1已付款后,更改该商品的销量
* （0待支付,1已付款,2未付款,3.售后(申请退款) 4.已退款）
*/
//订单修改支付状 //更改该商品的销量
Result updateByordersState1ANDproductSales(Integer ordersId,Integer productId);
//修改状态为 2未付款
Result updateByordersState2(Integer ordersId);
//3.售后(申请退款)
Result updateByordersState3(Integer ordersId);
// 4.已退款
Result updateByordersState4(Integer ordersId);
}

59
cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java
View File

@ -3,13 +3,16 @@ package com.muyu.cloud.market.service.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.muyu.cloud.market.domin.Orders;
import com.muyu.cloud.market.domin.User;
import com.muyu.cloud.market.domin.req.OrdersAddReq;
import com.muyu.cloud.market.domin.req.OrdersListReq;
import com.muyu.cloud.market.domin.req.OrdersUpdReq;
import com.muyu.cloud.market.mapper.OrderShowMapper;
import com.muyu.cloud.market.service.OrderShowService;
import com.muyu.common.core.domain.Result;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -18,9 +21,13 @@ import java.util.List;
@Service
@Log4j2
public class OrderShowServiceImpl implements OrderShowService {
@Resource
private OrderShowMapper orderShowMapper;
@Autowired
private HttpServletResponse response;
/**
* 查询订单列表
@ -123,6 +130,12 @@ public class OrderShowServiceImpl implements OrderShowService {
}
@Override
public Orders selectByOrderNo(String ordersNum) {
return null;
}
@Override
public List<Orders> getOutAll() {
return orderShowMapper.getOutAll();
@ -133,8 +146,48 @@ public class OrderShowServiceImpl implements OrderShowService {
return orderShowMapper.getSeleOut(ids);
}
public Orders selectByOrderNo(String ordersNum) {
return orderShowMapper.selectByordersNum(ordersNum);
@Override
public Result updateByordersState1ANDproductSales(Integer ordersId, Integer productId) {
Integer updateByordersState1 = orderShowMapper.updateByordersState1(ordersId);
if(updateByordersState1 > 0){
Integer updateByproductSales = orderShowMapper.updateByproductSales(productId);
if(updateByproductSales > 0){
log.info("订单信息+产品信息",ordersId,productId);
Result.success(200,"修改成功");
}
}
return Result.error(402,"修改失败");
}
@Override
public Result updateByordersState2(Integer ordersId) {
Integer updateByordersState2 = orderShowMapper.updateByordersState2(ordersId);
if(updateByordersState2 > 0){
Result.success(ordersId,"修改成功");
}
return Result.error(402,"修改失败");
}
@Override
public Result updateByordersState3(Integer ordersId) {
Integer updateByordersState3 = orderShowMapper.updateByordersState3(ordersId);
if(updateByordersState3 > 0){
return Result.success(ordersId,"修改成功");
}
return Result.error(402,"修改失败");
}
@Override
public Result updateByordersState4(Integer ordersId) {
Integer updateByordersState4 = orderShowMapper.updateByordersState4(ordersId);
if(updateByordersState4 > 0){
return Result.success(ordersId,"修改成功");
}
return Result.error(402,"修改失败");
}

41
cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml
View File

@ -54,7 +54,7 @@
ORDER BY orders_launchdate DESC
</select>
<!--添加订单到-->
<!--添加订单-->
<insert id="addOrdeds">
INSERT INTO `orders`
(`orders_num`, `orders_product`, `orders_user`, `orders_price`, `orders_specification`, `orders_state`, `orders_launchdate`)
@ -62,6 +62,7 @@
(#{ordersNum}, #{ordersProduct}, #{ordersUser}, #{ordersPrice}, #{ordersSpecification}, 0, NOW());
</insert>
<!--修改订单数据-->
<update id="updateOrders">
UPDATE `orders` SET `orders`.`orders_product` = #{ordersProduct},
`orders`.`orders_price` = #{ordersPrice},
@ -70,23 +71,53 @@
WHERE `orders`.`orders_id` = #{ordersId}
</update>
<!-- 逻辑删除 改变字段状态 -->
<!-- 逻辑删除 改变字段状态 为0 不存在 -->
<update id="updateByeExist">
UPDATE `orders` SET `orders`.`exist` = 0 WHERE `orders`.`orders_id` = #{ordersId}
</update>
<!-- 逻辑字段 修改字段状态 -->
<!-- 逻辑复原 修改字段状态 为1 存在-->
<update id="updateByExist">
UPDATE `orders` SET `orders`.`exist` = 1 WHERE `orders`.`orders_id` = #{ordersId}
</update>
<update id="updateState"></update>
<!-- /**
* 订单修改支付状态后,更改该商品的销量
* （0待支付,1已付款,2未付款,3.售后(申请退款) 4.已退款）
*/-->
<update id="updateByordersState1">
UPDATE `orders`
SET `orders_state` = 1,
WHERE `orders_id` = #{ordersId}
</update>
<update id="updateByproductSales">
UPDATE `product`
SET `product_sales` = product_sales + 1
WHERE `product_id` = #{productId}
</update>
<update id="updateByordersState2">
UPDATE `orders`
SET `orders_state`= 2
WHERE `orders_id`= #{ordersId}
</update>
<update id="updateByordersState3">
UPDATE `orders`
SET `orders_state`= 3
WHERE `orders_id`= #{ordersId}
</update>
<update id="updateByordersState4">
UPDATE `orders`
SET `orders_state`= 4
WHERE `orders_id`= #{ordersId}
</update>
<!-- 彻底删除(根据orderid删除数据库字段)-->
<delete id="delByOrderId">
DELETE FROM `orders` WHERE `orders`.`orders_id` = #{ordersId}
</delete>
<!--订单回显: 根据ordersId回显数据-->
<select id="findAllById" resultMap="goodsResult">
<include refid="ordersSql"/>