diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml index f411a21..781eeae 100644 --- a/sf-admin/pom.xml +++ b/sf-admin/pom.xml @@ -60,6 +60,12 @@ com.smarterFramework sf-file + + com.smarterFramework + sf-order + 1.0.0 + compile + diff --git a/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml b/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml index 5c11beb..ffa20fa 100644 --- a/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml +++ b/sf-admin/src/main/resources/mapper/goods/GoodsMessagesMapper.xml @@ -40,7 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into GOODS_MESSAGES diff --git a/sf-common/src/main/java/com/sf/common/exception/BusinessException.java b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java new file mode 100644 index 0000000..26ba14a --- /dev/null +++ b/sf-common/src/main/java/com/sf/common/exception/BusinessException.java @@ -0,0 +1,77 @@ +package com.sf.common.exception; + + +import com.sf.common.enums.ErrorCodeTypeEnum; + +/** + * @author : yswjme@163.com + * @Title : BusinessException.java + * @Package : com.zsmarter.ai.word.exception + * @Descript : 业务运行时异常 + * @date : 2020-06-29 04:59:44 + * @vsersion : V1.0 + */ +public class BusinessException extends RuntimeException { + + private static final long serialVersionUID = 4693786499059513760L; + + private ErrorCodeTypeEnum errorCodeTypeEnum; + + private final String errorDescription; + + private String errorCode; + + public BusinessException(String errorDescription) { + super(errorDescription); + this.errorDescription = errorDescription; + } + + public BusinessException(String errorDescription, Throwable t) { + super(errorDescription, t); + this.errorDescription = errorDescription; + } + + public BusinessException(String code, String errorDescription) { + super(errorDescription); + this.errorDescription = errorDescription; + this.errorCode = code; + } + + public BusinessException(String code, String errorDescription, Throwable t) { + super(errorDescription, t); + this.errorDescription = errorDescription; + this.errorCode = code; + } + + public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription) { + super(errorDescription); + this.errorDescription = errorDescription; + this.errorCode = code; + this.errorCodeTypeEnum = errorCodeTypeEnum; + } + + public BusinessException(ErrorCodeTypeEnum errorCodeTypeEnum, String code, String errorDescription, Throwable t) { + super(errorDescription, t); + this.errorDescription = errorDescription; + this.errorCode = code; + this.errorCodeTypeEnum = errorCodeTypeEnum; + } + + public String getErrorDescription() { + return this.errorDescription; + } + + public String getErrorCode() { + return errorCode; + } + + public String getErrorTitle() { + return "业务校验失败!"; + } + + public ErrorCodeTypeEnum getErrorCodeTypeEnum() { + return errorCodeTypeEnum; + } + + +} diff --git a/sf-order/pom.xml b/sf-order/pom.xml new file mode 100644 index 0000000..08b9c37 --- /dev/null +++ b/sf-order/pom.xml @@ -0,0 +1,34 @@ + + + + smarterFramework + com.smarterFramework + 1.0.0 + + 4.0.0 + + sf-order + + + order订单模块 + + + + + + + com.smarterFramework + sf-common + + + io.swagger.core.v3 + swagger-annotations + 2.1.2 + compile + + + + + \ No newline at end of file diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java new file mode 100644 index 0000000..6e165a8 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java @@ -0,0 +1,367 @@ +package com.sf.order.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.sf.common.annotation.Excel; +import com.sf.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 订单基础信息对象 ORDER_INFO + * + * @author ztzh + * @date 2024-04-09 + */ +public class OrderInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 订单编号 + */ + @Excel(name = "订单编号") + private Long orderNo; + + /** + * 订单状态: + * 0:待支付 + * 1:已付款 + * 2:支付超时系统结束 + * 3:已完成 + */ + @Excel(name = "订单状态: 0:待支付 1:已付款 2:支付超时系统结束 3:已完成 ") + private Long orderStatus; + + /** + * 支付方式:0-点券 1-现金 + */ + @Excel(name = "支付方式:0-点券 1-现金") + private Long payType; + + /** + * 支付渠道(支付方式为现金时) + * 0:微信 + * 1:支付宝 + */ + @Excel(name = "支付渠道(支付方式为现金时) 0:微信 1:支付宝") + private Long payChannel; + + /** + * 订单金额 + */ + @Excel(name = "订单金额") + private Long orderAmt; + + /** + * 运费 + */ + @Excel(name = "运费") + private Long freightAmt; + + /** + * 总金额 + */ + @Excel(name = "总金额") + private Long payAmt; + + /** + * 实际支付金额 + */ + @Excel(name = "实际支付金额") + private Long reallyAmt; + + /** + * 收件方式 + * :0-自提 + * 1-快递 2-配送 + */ + @Excel(name = "收件方式:0-自提 1-快递 2-配送") + private Long receiveType; + + /** + * 商品Id + */ + @Excel(name = "商品Id") + private Long goodsId; + + /** + * 商户Id + */ + @Excel(name = "商户Id") + private Long businessId; + + /** + * 收货地址配置Id + */ + @Excel(name = "收货地址配置Id") + private Long receiveAddrId; + + /** + * 支付时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date payTime; + + /** + * 订单创建人 + */ + @Excel(name = "订单创建人") + private Long createUserId; + + /** + * 最后一次更新操作人 + */ + @Excel(name = "最后一次更新操作人") + private Long updateUserId; + + /** + * 逻辑删除标识 + * 0:未删除 + * 1:已删除 + */ + @Excel(name = "逻辑删除标识 0:未删除 1:已删除") + private Long isDelete; + + /** + * 快递单号 + */ + @Excel(name = "快递单号") + private String trackNo; + + /** + * 订单类型0:自动1:手动 + */ + @Excel(name = "订单类型0:自动1:手动") + private Long orderType; + + /** + * 平台外部订单号 + */ + @Excel(name = "平台外部订单号") + private Long outOrderNo; + + /** + * 平台支付返回值 + */ + @Excel(name = "平台支付返回值") + private String payData; + + /** + * 减免金额(优惠券抵扣) + */ + @Excel(name = "减免金额(优惠券抵扣)") + private Long reductionAmout; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setOrderNo(Long orderNo) { + this.orderNo = orderNo; + } + + public Long getOrderNo() { + return orderNo; + } + + public void setOrderStatus(Long orderStatus) { + this.orderStatus = orderStatus; + } + + public Long getOrderStatus() { + return orderStatus; + } + + public void setPayType(Long payType) { + this.payType = payType; + } + + public Long getPayType() { + return payType; + } + + public void setPayChannel(Long payChannel) { + this.payChannel = payChannel; + } + + public Long getPayChannel() { + return payChannel; + } + + public void setOrderAmt(Long orderAmt) { + this.orderAmt = orderAmt; + } + + public Long getOrderAmt() { + return orderAmt; + } + + public void setFreightAmt(Long freightAmt) { + this.freightAmt = freightAmt; + } + + public Long getFreightAmt() { + return freightAmt; + } + + public void setPayAmt(Long payAmt) { + this.payAmt = payAmt; + } + + public Long getPayAmt() { + return payAmt; + } + + public void setReallyAmt(Long reallyAmt) { + this.reallyAmt = reallyAmt; + } + + public Long getReallyAmt() { + return reallyAmt; + } + + public void setReceiveType(Long receiveType) { + this.receiveType = receiveType; + } + + public Long getReceiveType() { + return receiveType; + } + + public void setGoodsId(Long goodsId) { + this.goodsId = goodsId; + } + + public Long getGoodsId() { + return goodsId; + } + + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + public Long getBusinessId() { + return businessId; + } + + public void setReceiveAddrId(Long receiveAddrId) { + this.receiveAddrId = receiveAddrId; + } + + public Long getReceiveAddrId() { + return receiveAddrId; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + public Date getPayTime() { + return payTime; + } + + public void setCreateUserId(Long createUserId) { + this.createUserId = createUserId; + } + + public Long getCreateUserId() { + return createUserId; + } + + public void setUpdateUserId(Long updateUserId) { + this.updateUserId = updateUserId; + } + + public Long getUpdateUserId() { + return updateUserId; + } + + public void setIsDelete(Long isDelete) { + this.isDelete = isDelete; + } + + public Long getIsDelete() { + return isDelete; + } + + public void setTrackNo(String trackNo) { + this.trackNo = trackNo; + } + + public String getTrackNo() { + return trackNo; + } + + public void setOrderType(Long orderType) { + this.orderType = orderType; + } + + public Long getOrderType() { + return orderType; + } + + public void setOutOrderNo(Long outOrderNo) { + this.outOrderNo = outOrderNo; + } + + public Long getOutOrderNo() { + return outOrderNo; + } + + public void setPayData(String payData) { + this.payData = payData; + } + + public String getPayData() { + return payData; + } + + public void setReductionAmout(Long reductionAmout) { + this.reductionAmout = reductionAmout; + } + + public Long getReductionAmout() { + return reductionAmout; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderNo", getOrderNo()) + .append("orderStatus", getOrderStatus()) + .append("payType", getPayType()) + .append("payChannel", getPayChannel()) + .append("orderAmt", getOrderAmt()) + .append("freightAmt", getFreightAmt()) + .append("payAmt", getPayAmt()) + .append("reallyAmt", getReallyAmt()) + .append("receiveType", getReceiveType()) + .append("goodsId", getGoodsId()) + .append("businessId", getBusinessId()) + .append("receiveAddrId", getReceiveAddrId()) + .append("createTime", getCreateTime()) + .append("payTime", getPayTime()) + .append("createUserId", getCreateUserId()) + .append("updateUserId", getUpdateUserId()) + .append("isDelete", getIsDelete()) + .append("updateTime", getUpdateTime()) + .append("trackNo", getTrackNo()) + .append("orderType", getOrderType()) + .append("outOrderNo", getOutOrderNo()) + .append("payData", getPayData()) + .append("reductionAmout", getReductionAmout()) + .toString(); + } +} diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java new file mode 100644 index 0000000..0359751 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java @@ -0,0 +1,59 @@ +package com.sf.order.domain.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import javax.validation.constraints.NotNull; + +/** + * @author : ztzh + * @since : 2023/7/27 + */ +@Schema(description = "下单") +public class OrderCreateDto { + + @Schema(description = "商品id") + @NotNull(message = "商品id不能为空") + private Long goodsId; + + @Schema(description = "数量") + @NotNull(message = "数量不能唯恐") + private Long count; + + @Schema(description = "金额") + @NotNull(message = "金额不能为空") + private Long amount; + + @Schema(description = "用户id") + @NotNull(message = "用户id不能空") + private Long userId; + + public Long getGoodsId() { + return goodsId; + } + + public void setGoodsId(Long goodsId) { + this.goodsId = goodsId; + } + public Long getCount() { + return count; + } + + public void setCount(Long count) { + this.count = count; + } + + public Long getAmount() { + return amount; + } + + public void setAmount(Long amount) { + this.amount = amount; + } + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } +} diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java new file mode 100644 index 0000000..3cbbbd8 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java @@ -0,0 +1,22 @@ +package com.sf.order.domain.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class OrderListreqVo { + /** + * 主键id + */ + private Long userId; + + /** + * 订单类型 + */ + private Long orderStatus; + + private Integer pageSize; + + private Integer pageNo; + +} diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java new file mode 100644 index 0000000..502a641 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java @@ -0,0 +1,53 @@ +package com.sf.order.domain.res; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 活动信息详情 + * + */ +@Data +@Schema(name = "OrderListResVo", description = "订单列表") +public class OrderListResVo { + /** + * 主键id + */ + private Long id; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 订单状态: + * 0:待支付 + * 1:已付款 + * 2:支付超时系统结束 + * 3:已完成 + */ + private Long orderStatus; + + /** + * 订单金额 + */ + private Long orderAmt; + + /** + * 商品标题 + */ + private String productTitle; + + /** + * 商品规格 + */ + private Integer goodsSpec; + /** + * 商品数量 + */ + private Integer goodsCount = 1; + +} diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java new file mode 100644 index 0000000..b4f9f31 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java @@ -0,0 +1,67 @@ +package com.sf.order.mapper; + +import com.sf.order.domain.OrderInfo; +import com.sf.order.domain.req.OrderListreqVo; +import com.sf.order.domain.res.OrderListResVo; + +import java.util.List; + + +/** + * 订单基础信息Mapper接口 + * + * @author ztzh + * @date 2024-04-09 + */ +public interface OrderInfoMapper { + /** + * 查询订单基础信息 + * + * @param id 订单基础信息主键 + * @return 订单基础信息 + */ + public OrderInfo selectOrderInfoById(Long id); + + /** + * 查询订单基础信息列表 + * + * @param orderInfo 订单基础信息 + * @return 订单基础信息集合 + */ + public List selectOrderInfoList(OrderInfo orderInfo); + + + List queryList(OrderListreqVo vo); + + /** + * 新增订单基础信息 + * + * @param orderInfo 订单基础信息 + * @return 结果 + */ + public int insertOrderInfo(OrderInfo orderInfo); + + /** + * 修改订单基础信息 + * + * @param orderInfo 订单基础信息 + * @return 结果 + */ + public int updateOrderInfo(OrderInfo orderInfo); + + /** + * 删除订单基础信息 + * + * @param id 订单基础信息主键 + * @return 结果 + */ + public int deleteOrderInfoById(Long id); + + /** + * 批量删除订单基础信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderInfoByIds(Long[] ids); +} diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java new file mode 100644 index 0000000..c63358f --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java @@ -0,0 +1,73 @@ +package com.sf.order.service; + + +import com.sf.order.domain.OrderInfo; +import com.sf.order.domain.dto.OrderCreateDto; +import com.sf.order.domain.req.OrderListreqVo; +import com.sf.order.domain.res.OrderListResVo; + +import java.util.List; + +/** + * 订单基础信息Service接口 + * + * @author ztzh + * @date 2024-04-09 + */ +public interface IOrderInfoService +{ + /** + * 查询订单基础信息 + * + * @param id 订单基础信息主键 + * @return 订单基础信息 + */ + public OrderInfo selectOrderInfoById(Long id); + + /** + * 查询订单基础信息列表 + * + * @param orderInfo 订单基础信息 + * @return 订单基础信息集合 + */ + public List selectOrderInfoList(OrderInfo orderInfo); + + /** + * 查询订单基础信息列表 + */ + List queryList(OrderListreqVo vo); + + /** + * 新增订单基础信息 + * + * @param orderInfo 订单基础信息 + * @return 结果 + */ + public int createOrder(OrderCreateDto orderInfo); + + /** + * 修改订单基础信息 + * + * @param orderInfo 订单基础信息 + * @return 结果 + */ + public int updateOrderInfo(OrderInfo orderInfo); + + /** + * 批量删除订单基础信息 + * + * @param ids 需要删除的订单基础信息主键集合 + * @return 结果 + */ + public int deleteOrderInfoByIds(Long[] ids); + + /** + * 删除订单基础信息信息 + * + * @param id 订单基础信息主键 + * @return 结果 + */ + public int deleteOrderInfoById(Long id); + + void orderPay(Long orderId); +} diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java new file mode 100644 index 0000000..315b818 --- /dev/null +++ b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java @@ -0,0 +1,137 @@ +package com.sf.order.service.impl; + +import java.util.List; + +import com.sf.common.exception.BusinessException; +import com.sf.common.utils.DateUtils; +import com.sf.common.utils.SnowflakeIdWorker; +import com.sf.order.domain.OrderInfo; +import com.sf.order.domain.dto.OrderCreateDto; +import com.sf.order.domain.req.OrderListreqVo; +import com.sf.order.domain.res.OrderListResVo; +import com.sf.order.mapper.OrderInfoMapper; +import com.sf.order.service.IOrderInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 订单基础信息Service业务层处理 + * + * @author ztzh + * @date 2024-04-09 + */ +@Service +public class OrderInfoServiceImpl implements IOrderInfoService +{ + @Resource + private OrderInfoMapper orderInfoMapper; + @Resource + private SnowflakeIdWorker snowflakeIdWorker; + + /** + * 查询订单基础信息 + * + * @param id 订单基础信息主键 + * @return 订单基础信息 + */ + @Override + public OrderInfo selectOrderInfoById(Long id) + { + return orderInfoMapper.selectOrderInfoById(id); + } + + /** + * 查询订单基础信息列表 + * + * @param orderInfo 订单基础信息 + * @return 订单基础信息 + */ + @Override + public List selectOrderInfoList(OrderInfo orderInfo) + { + return orderInfoMapper.selectOrderInfoList(orderInfo); + } + public List queryList(OrderListreqVo vo) + { + return orderInfoMapper.queryList(vo); + } + + /** + * 新增订单基础信息 + * + * @param orderCreateDto 订单基础信息 + * @return 结果 + */ + @Override + public int createOrder(OrderCreateDto orderCreateDto) + { + OrderInfo orderInfo = new OrderInfo(); + orderInfo.setOrderNo(snowflakeIdWorker.nextId()); + orderInfo.setPayType(0L); + orderInfo.setReceiveType(0L); + orderInfo.setOrderStatus(0l); + orderInfo.setCreateUserId(orderCreateDto.getUserId()); + orderInfo.setUpdateUserId(orderCreateDto.getUserId()); + orderInfo.setGoodsId(orderCreateDto.getGoodsId()); + orderInfo.setOrderAmt(orderCreateDto.getAmount()); + orderInfo.setPayAmt(orderCreateDto.getAmount()); + orderInfo.setCreateTime(DateUtils.getNowDate()); + orderInfo.setUpdateTime(DateUtils.getNowDate()); + return orderInfoMapper.insertOrderInfo(orderInfo); + } + + /** + * 修改订单基础信息 + * + * @param orderInfo 订单基础信息 + * @return 结果 + */ + @Override + public int updateOrderInfo(OrderInfo orderInfo) + { + orderInfo.setUpdateTime(DateUtils.getNowDate()); + return orderInfoMapper.updateOrderInfo(orderInfo); + } + @Override + public void orderPay(Long orderId) { + OrderInfo updateOrder = this.selectOrderInfoById(orderId); + if (updateOrder == null) { + throw new BusinessException("订单缺失!"); + } +// if (!OrderInfoConstant.ORDER_WAITING_FOR_PAYMENT.equals(orderInfo.getOrderStatus())) { +// throw new BusinessException("订单状态异常!"); +// } + updateOrder.setOrderStatus(1L); + updateOrder.setPayTime(DateUtils.getNowDate()); + // 修改订单状态 + if (1>this.updateOrderInfo(updateOrder)) { + throw new BusinessException("支付异常,请联系管理员!"); + } + } + + /** + * 批量删除订单基础信息 + * + * @param ids 需要删除的订单基础信息主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoByIds(Long[] ids) + { + return orderInfoMapper.deleteOrderInfoByIds(ids); + } + + /** + * 删除订单基础信息信息 + * + * @param id 订单基础信息主键 + * @return 结果 + */ + @Override + public int deleteOrderInfoById(Long id) + { + return orderInfoMapper.deleteOrderInfoById(id); + } + +} diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml new file mode 100644 index 0000000..811f46a --- /dev/null +++ b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO + + + select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO + + + + + + + + + insert into ORDER_INFO + + id, + order_no, + order_status, + pay_type, + pay_channel, + order_amt, + freight_amt, + pay_amt, + really_amt, + receive_type, + goods_id, + business_id, + receive_addr_id, + create_time, + pay_time, + create_user_id, + update_user_id, + is_delete, + update_time, + track_no, + order_type, + out_order_no, + pay_data, + reduction_amout, + + + #{id}, + #{orderNo}, + #{orderStatus}, + #{payType}, + #{payChannel}, + #{orderAmt}, + #{freightAmt}, + #{payAmt}, + #{reallyAmt}, + #{receiveType}, + #{goodsId}, + #{businessId}, + #{receiveAddrId}, + #{createTime}, + #{payTime}, + #{createUserId}, + #{updateUserId}, + #{isDelete}, + #{updateTime}, + #{trackNo}, + #{orderType}, + #{outOrderNo}, + #{payData}, + #{reductionAmout}, + + + + + update ORDER_INFO + + order_no = #{orderNo}, + order_status = #{orderStatus}, + pay_type = #{payType}, + pay_channel = #{payChannel}, + order_amt = #{orderAmt}, + freight_amt = #{freightAmt}, + pay_amt = #{payAmt}, + really_amt = #{reallyAmt}, + receive_type = #{receiveType}, + goods_id = #{goodsId}, + business_id = #{businessId}, + receive_addr_id = #{receiveAddrId}, + create_time = #{createTime}, + pay_time = #{payTime}, + create_user_id = #{createUserId}, + update_user_id = #{updateUserId}, + is_delete = #{isDelete}, + update_time = #{updateTime}, + track_no = #{trackNo}, + order_type = #{orderType}, + out_order_no = #{outOrderNo}, + pay_data = #{payData}, + reduction_amout = #{reductionAmout}, + + where id = #{id} + + + + delete from ORDER_INFO where id = #{id} + + + + delete from ORDER_INFO where id in + + #{id} + + + \ No newline at end of file diff --git a/sf-ui/.env.development b/sf-ui/.env.development index 18b2a3e..b2d594f 100644 --- a/sf-ui/.env.development +++ b/sf-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = SAC管理系统 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# SAC管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/sf-ui/.env.production b/sf-ui/.env.production index cb064ec..cbbe0e4 100644 --- a/sf-ui/.env.production +++ b/sf-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = SAC管理系统 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# SAC管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/sf-ui/.env.staging b/sf-ui/.env.staging index a47af9a..b55b86d 100644 --- a/sf-ui/.env.staging +++ b/sf-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = SAC管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# SAC管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/sf-ui/package.json b/sf-ui/package.json index 255259d..060a9b0 100644 --- a/sf-ui/package.json +++ b/sf-ui/package.json @@ -1,8 +1,8 @@ { "name": "ruoyi", "version": "3.8.6", - "description": "若依管理系统", - "author": "若依", + "description": "SAC管理系统", + "author": "SAC", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/sf-ui/src/api/FDS/installList.js b/sf-ui/src/api/FDS/installList.js new file mode 100644 index 0000000..b544121 --- /dev/null +++ b/sf-ui/src/api/FDS/installList.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询安装包管理(新)列表 +export function listINFO(query) { + return request({ + url: '/deploy/INFO/list', + method: 'get', + params: query + }) +} + +// 查询安装包管理(新)详细 +export function getINFO(id) { + return request({ + url: '/deploy/INFO/' + id, + method: 'get' + }) +} + +// 新增安装包管理(新) +export function addINFO(data) { + return request({ + url: '/deploy/INFO', + method: 'post', + data: data + }) +} + +// 修改安装包管理(新) +export function updateINFO(data) { + return request({ + url: '/deploy/INFO', + method: 'put', + data: data + }) +} + +// 删除安装包管理(新) +export function delINFO(id) { + return request({ + url: '/deploy/INFO/' + id, + method: 'delete' + }) +} diff --git a/sf-ui/src/api/FDS/whiteList.js b/sf-ui/src/api/FDS/whiteList.js new file mode 100644 index 0000000..96b925c --- /dev/null +++ b/sf-ui/src/api/FDS/whiteList.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + + + +export function Document11691998078000list(query) { + return request({ + url: '/forms/api/router/get/Document11691998078000list', + method: 'get', + params: query + }) +} + + diff --git a/sf-ui/src/assets/images/code.png b/sf-ui/src/assets/images/code.png new file mode 100644 index 0000000..9111a07 Binary files /dev/null and b/sf-ui/src/assets/images/code.png differ diff --git a/sf-ui/src/layout/components/index.js b/sf-ui/src/layout/components/index.js index 9d2424c..d60f9ef 100644 --- a/sf-ui/src/layout/components/index.js +++ b/sf-ui/src/layout/components/index.js @@ -1,6 +1,6 @@ export { default as AppMain } from './AppMain' export { default as Navbar } from './Navbar' -export { default as NavbarNew } from './NavbarNew' +// export { default as NavbarNew } from './NavbarNew' export { default as Settings } from './Settings' export { default as Sidebar } from './Sidebar/index.vue' export { default as TagsView } from './TagsView/index.vue' diff --git a/sf-ui/src/router/index.js b/sf-ui/src/router/index.js index 7def37b..d892652 100644 --- a/sf-ui/src/router/index.js +++ b/sf-ui/src/router/index.js @@ -1,11 +1,10 @@ import Vue from 'vue' import Router from 'vue-router' - -Vue.use(Router) - /* Layout */ import Layout from '@/layout' +Vue.use(Router) + /** * Note: 路由配置项 * @@ -20,12 +19,12 @@ import Layout from '@/layout' * roles: ['admin', 'common'] // 访问路由的角色权限 * permissions: ['a:a:a', 'b:b:b'] // 访问路由的菜单权限 * meta : { - noCache: true // 如果设置为true,则不会被 缓存(默认 false) - title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 - icon: 'svg-name' // 设置该路由的图标,对应路径src/assets/icons/svg - breadcrumb: false // 如果设置为false,则不会在breadcrumb面包屑中显示 - activeMenu: '/system/user' // 当路由设置了该属性,则会高亮相对应的侧边栏。 - } + noCache: true // 如果设置为true,则不会被 缓存(默认 false) + title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 + icon: 'svg-name' // 设置该路由的图标,对应路径src/assets/icons/svg + breadcrumb: false // 如果设置为false,则不会在breadcrumb面包屑中显示 + activeMenu: '/system/user' // 当路由设置了该属性,则会高亮相对应的侧边栏。 + } */ // 公共路由 @@ -101,7 +100,7 @@ export const dynamicRoutes = [ { path: 'role/:userId(\\d+)', // component: () => import('@/views/system/user/authRole'), - component: (resolve) => require(['@/views/system/user/authRole'],resolve), + component: (resolve) => require(['@/views/system/user/authRole'], resolve), name: 'AuthRole', meta: { title: '分配角色', activeMenu: '/system/user' } } @@ -162,12 +161,115 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] + }, + { + path: '/build/install', + component: Layout, + hidden: true, + permissions: ['build:install:add'], + children: [ + { + path: 'add', + component: () => import('@/views/FDS/installationList/add'), + name: 'InstallAdd', + meta: { title: '新增安装包', activeMenu: '/build/installationList' } + } + ] + }, + { + path: '/build/install', + component: Layout, + hidden: true, + permissions: ['build:install:detail'], + children: [ + { + path: 'detail', + component: () => import('@/views/FDS/installationList/detail'), + name: 'InstallDetail', + meta: { title: '安装包详情', activeMenu: '/build/installationList' } + } + ] + }, + + { + path: '/build/publishList', + component: Layout, + hidden: true, + permissions: ['build:publishList:add'], + children: [ + { + path: 'add', + component: () => import('@/views/FDS/publishList/add'), + name: 'PublishAdd', + meta: { title: '新增发布', activeMenu: '/build/publish' } + } + ] + }, + { + path: '/build/publishList', + component: Layout, + hidden: true, + permissions: ['build:publishList:detail'], + children: [ + { + path: 'detail', + component: () => import('@/views/FDS/publishList/detail'), + name: 'PublishDetail', + meta: { title: '发布详情', activeMenu: '/build/publish' } + } + ] + }, + + { + path: '/build/whiteListManagement', + component: Layout, + hidden: true, + permissions: ['build:whiteListManagement:add'], + children: [ + { + path: 'add', + component: () => import('@/views/FDS/whiteListManagement/add'), + name: 'WhiteListManagementAdd', + meta: { title: '新增白名单', activeMenu: '/build/whiteListManagement' } + } + ] + }, + + { + path: '/build/whiteListManagement', + component: Layout, + hidden: true, + permissions: ['build:whiteListManagement:detail'], + children: [ + { + path: 'detail', + component: () => import('@/views/FDS/whiteListManagement/detail'), + name: 'WhiteListManagementDetail', + meta: { title: '白名单详情', activeMenu: '/build/whiteListManagement' } + } + ] + }, + + { + path: '/build/whiteListManagement', + component: Layout, + hidden: true, + permissions: ['build:whiteListManagement:addConfig'], + children: [ + { + path: 'addConfig', + component: () => import('@/views/FDS/whiteListManagement/addConfig'), + name: 'WhiteListManagementConfigAdd', + meta: { title: '新增白名单配置', activeMenu: '/build/whiteListManagement' } + } + ] } + ] // 防止连续点击多次路由报错 -let routerPush = Router.prototype.push; -let routerReplace = Router.prototype.replace; +let routerPush = Router.prototype.push +let routerReplace = Router.prototype.replace // push Router.prototype.push = function push(location) { return routerPush.call(this, location).catch(err => err) diff --git a/sf-ui/src/views/FDS/appManagement/add.vue b/sf-ui/src/views/FDS/appManagement/add.vue new file mode 100644 index 0000000..b415f0d --- /dev/null +++ b/sf-ui/src/views/FDS/appManagement/add.vue @@ -0,0 +1,120 @@ + + + diff --git a/sf-ui/src/views/FDS/appManagement/index.vue b/sf-ui/src/views/FDS/appManagement/index.vue new file mode 100644 index 0000000..67b220c --- /dev/null +++ b/sf-ui/src/views/FDS/appManagement/index.vue @@ -0,0 +1,207 @@ + + diff --git a/sf-ui/src/views/FDS/channelManagement/add.vue b/sf-ui/src/views/FDS/channelManagement/add.vue new file mode 100644 index 0000000..d80ce25 --- /dev/null +++ b/sf-ui/src/views/FDS/channelManagement/add.vue @@ -0,0 +1,120 @@ + + + diff --git a/sf-ui/src/views/FDS/channelManagement/index.vue b/sf-ui/src/views/FDS/channelManagement/index.vue new file mode 100644 index 0000000..30fadde --- /dev/null +++ b/sf-ui/src/views/FDS/channelManagement/index.vue @@ -0,0 +1,210 @@ + + diff --git a/sf-ui/src/views/FDS/hotfix/add.vue b/sf-ui/src/views/FDS/hotfix/add.vue new file mode 100644 index 0000000..41785d8 --- /dev/null +++ b/sf-ui/src/views/FDS/hotfix/add.vue @@ -0,0 +1,439 @@ + + + diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue new file mode 100644 index 0000000..c7c6eb9 --- /dev/null +++ b/sf-ui/src/views/FDS/installationList/add.vue @@ -0,0 +1,168 @@ + + + diff --git a/sf-ui/src/views/FDS/installationList/detail.vue b/sf-ui/src/views/FDS/installationList/detail.vue new file mode 100644 index 0000000..df44815 --- /dev/null +++ b/sf-ui/src/views/FDS/installationList/detail.vue @@ -0,0 +1,89 @@ + + + diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue new file mode 100644 index 0000000..24aa39f --- /dev/null +++ b/sf-ui/src/views/FDS/installationList/index.vue @@ -0,0 +1,311 @@ + + diff --git a/sf-ui/src/views/FDS/publishList/add.vue b/sf-ui/src/views/FDS/publishList/add.vue new file mode 100644 index 0000000..44f8626 --- /dev/null +++ b/sf-ui/src/views/FDS/publishList/add.vue @@ -0,0 +1,301 @@ + + + diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue new file mode 100644 index 0000000..7523554 --- /dev/null +++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue @@ -0,0 +1,128 @@ + + diff --git a/sf-ui/src/views/FDS/publishList/detail.vue b/sf-ui/src/views/FDS/publishList/detail.vue new file mode 100644 index 0000000..089cf50 --- /dev/null +++ b/sf-ui/src/views/FDS/publishList/detail.vue @@ -0,0 +1,144 @@ + + + diff --git a/sf-ui/src/views/FDS/publishList/index.vue b/sf-ui/src/views/FDS/publishList/index.vue new file mode 100644 index 0000000..5fd518f --- /dev/null +++ b/sf-ui/src/views/FDS/publishList/index.vue @@ -0,0 +1,368 @@ + + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/add.vue b/sf-ui/src/views/FDS/whiteListManagement/add.vue new file mode 100644 index 0000000..51112f3 --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/add.vue @@ -0,0 +1,123 @@ + + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue b/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue new file mode 100644 index 0000000..638a13f --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/addConfig.vue @@ -0,0 +1,194 @@ +、 + + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue b/sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue new file mode 100644 index 0000000..c63b1d8 --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/components/editWhiteList.vue @@ -0,0 +1,95 @@ + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/detail.vue b/sf-ui/src/views/FDS/whiteListManagement/detail.vue new file mode 100644 index 0000000..180a8f8 --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/detail.vue @@ -0,0 +1,220 @@ + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue b/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue new file mode 100644 index 0000000..dbb9e8c --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/equepDetail.vue @@ -0,0 +1,219 @@ + + diff --git a/sf-ui/src/views/FDS/whiteListManagement/index.vue b/sf-ui/src/views/FDS/whiteListManagement/index.vue new file mode 100644 index 0000000..f18b508 --- /dev/null +++ b/sf-ui/src/views/FDS/whiteListManagement/index.vue @@ -0,0 +1,339 @@ + + diff --git a/sf-ui/src/views/deploy/INFO/add.vue b/sf-ui/src/views/deploy/INFO/add.vue index c9bc57b..e15f185 100644 --- a/sf-ui/src/views/deploy/INFO/add.vue +++ b/sf-ui/src/views/deploy/INFO/add.vue @@ -16,67 +16,66 @@ - - + + - - + + - - + 上传文件 - - + + - - - {{ item.label }} - - + + + + - - - - - - - - - - + + + + + + + + + + 提交 重置 - - - - -