diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java new file mode 100644 index 0000000..a9fbbac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java @@ -0,0 +1,71 @@ +package com.ruoyi.web.controller.jarvis; + +import java.util.List; + +import com.ruoyi.jarvis.domain.OrderRows; +import com.ruoyi.jarvis.service.IOrderRowsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +import javax.servlet.http.HttpServletResponse; + +/** + * 京粉订单Controller + * + * @author ruoyi + */ +@RestController +@RequestMapping("/jarvis/orderrows") +public class OrderRowsController extends BaseController +{ + @Autowired + private IOrderRowsService orderRowsService; + + /** + * 查询京粉订单列表 + */ + + @GetMapping("/list") + public TableDataInfo list(OrderRows orderRows) + { + startPage(); + List list = orderRowsService.selectOrderRowsList(orderRows); + return getDataTable(list); + } + + /** + * 导出京粉订单列表 + */ + + @Log(title = "京粉订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OrderRows orderRows) + { + List list = orderRowsService.selectOrderRowsList(orderRows); + ExcelUtil util = new ExcelUtil(OrderRows.class); + util.exportExcel(response, list, "京粉订单数据"); + } + + /** + * 获取京粉订单详细信息 + */ + + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(orderRowsService.selectOrderRowsById(id)); + } + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java new file mode 100644 index 0000000..520ec3d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java @@ -0,0 +1,690 @@ +package com.ruoyi.jarvis.domain; + +import java.util.Date; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 京粉订单对象 order_rows + * + * @author ruoyi + */ +public class OrderRows extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private String id; + + /** 订单ID */ + private Long orderId; + + /** 父订单ID */ + private Long parentId; + + /** 下单时间 */ + private Date orderTime; + + /** 完成时间 */ + private Date finishTime; + + /** 修改时间 */ + private Date modifyTime; + + /** 订单类型 */ + private Integer orderEmt; + + /** 是否PLUS会员 */ + private Integer plus; + + /** 联盟ID */ + private Long unionId; + + /** SKU ID */ + private Long skuId; + + /** SKU名称 */ + private String skuName; + + /** SKU数量 */ + private Integer skuNum; + + /** SKU退货数量 */ + private Integer skuReturnNum; + + /** SKU冻结数量 */ + private Integer skuFrozenNum; + + /** 价格 */ + private Double price; + + /** 佣金比例 */ + private Double commissionRate; + + /** 子边比例 */ + private Double subSideRate; + + /** 补贴比例 */ + private Double subsidyRate; + + /** 最终比例 */ + private Double finalRate; + + /** 预估成本价 */ + private Double estimateCosPrice; + + /** 预估佣金 */ + private Double estimateFee; + + /** 实际成本价 */ + private Double actualCosPrice; + + /** 实际佣金 */ + private Double actualFee; + + /** 有效性 */ + private Integer validCode; + + /** 跟踪类型 */ + private Integer traceType; + + /** 位置ID */ + private Long positionId; + + /** 站点ID */ + private Long siteId; + + /** 联盟别名 */ + private String unionAlias; + + /** PID */ + private String pid; + + /** 一级分类ID */ + private Long cid1; + + /** 二级分类ID */ + private Long cid2; + + /** 三级分类ID */ + private Long cid3; + + /** 子联盟ID */ + private String subUnionId; + + /** 联盟标签 */ + private String unionTag; + + /** POP ID */ + private Long popId; + + /** 扩展字段1 */ + private String ext1; + + /** 支付月份 */ + private String payMonth; + + /** 活动ID */ + private Long cpActId; + + /** 联盟角色 */ + private Integer unionRole; + + /** 礼品券OCS金额 */ + private Double giftCouponOcsAmount; + + /** 礼品券KEY */ + private String giftCouponKey; + + /** 余额扩展 */ + private String balanceExt; + + /** 签名 */ + private String sign; + + /** 促销价格金额 */ + private Double proPriceAmount; + + /** RID */ + private Long rid; + + /** 商品信息ID */ + private Long goodsInfoId; + + /** 快递状态 */ + private Integer expressStatus; + + /** 渠道ID */ + private Long channelId; + + /** SKU标签 */ + private String skuTag; + + /** 商品ID */ + private String itemId; + + /** 调用方商品ID */ + private String callerItemId; + + /** 订单标签 */ + private String orderTag; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public Long getOrderId() + { + return orderId; + } + + public void setOrderId(Long orderId) + { + this.orderId = orderId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Date getOrderTime() + { + return orderTime; + } + + public void setOrderTime(Date orderTime) + { + this.orderTime = orderTime; + } + + public Date getFinishTime() + { + return finishTime; + } + + public void setFinishTime(Date finishTime) + { + this.finishTime = finishTime; + } + + public Date getModifyTime() + { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) + { + this.modifyTime = modifyTime; + } + + public Integer getOrderEmt() + { + return orderEmt; + } + + public void setOrderEmt(Integer orderEmt) + { + this.orderEmt = orderEmt; + } + + public Integer getPlus() + { + return plus; + } + + public void setPlus(Integer plus) + { + this.plus = plus; + } + + public Long getUnionId() + { + return unionId; + } + + public void setUnionId(Long unionId) + { + this.unionId = unionId; + } + + public Long getSkuId() + { + return skuId; + } + + public void setSkuId(Long skuId) + { + this.skuId = skuId; + } + + public String getSkuName() + { + return skuName; + } + + public void setSkuName(String skuName) + { + this.skuName = skuName; + } + + public Integer getSkuNum() + { + return skuNum; + } + + public void setSkuNum(Integer skuNum) + { + this.skuNum = skuNum; + } + + public Integer getSkuReturnNum() + { + return skuReturnNum; + } + + public void setSkuReturnNum(Integer skuReturnNum) + { + this.skuReturnNum = skuReturnNum; + } + + public Integer getSkuFrozenNum() + { + return skuFrozenNum; + } + + public void setSkuFrozenNum(Integer skuFrozenNum) + { + this.skuFrozenNum = skuFrozenNum; + } + + public Double getPrice() + { + return price; + } + + public void setPrice(Double price) + { + this.price = price; + } + + public Double getCommissionRate() + { + return commissionRate; + } + + public void setCommissionRate(Double commissionRate) + { + this.commissionRate = commissionRate; + } + + public Double getSubSideRate() + { + return subSideRate; + } + + public void setSubSideRate(Double subSideRate) + { + this.subSideRate = subSideRate; + } + + public Double getSubsidyRate() + { + return subsidyRate; + } + + public void setSubsidyRate(Double subsidyRate) + { + this.subsidyRate = subsidyRate; + } + + public Double getFinalRate() + { + return finalRate; + } + + public void setFinalRate(Double finalRate) + { + this.finalRate = finalRate; + } + + public Double getEstimateCosPrice() + { + return estimateCosPrice; + } + + public void setEstimateCosPrice(Double estimateCosPrice) + { + this.estimateCosPrice = estimateCosPrice; + } + + public Double getEstimateFee() + { + return estimateFee; + } + + public void setEstimateFee(Double estimateFee) + { + this.estimateFee = estimateFee; + } + + public Double getActualCosPrice() + { + return actualCosPrice; + } + + public void setActualCosPrice(Double actualCosPrice) + { + this.actualCosPrice = actualCosPrice; + } + + public Double getActualFee() + { + return actualFee; + } + + public void setActualFee(Double actualFee) + { + this.actualFee = actualFee; + } + + public Integer getValidCode() + { + return validCode; + } + + public void setValidCode(Integer validCode) + { + this.validCode = validCode; + } + + public Integer getTraceType() + { + return traceType; + } + + public void setTraceType(Integer traceType) + { + this.traceType = traceType; + } + + public Long getPositionId() + { + return positionId; + } + + public void setPositionId(Long positionId) + { + this.positionId = positionId; + } + + public Long getSiteId() + { + return siteId; + } + + public void setSiteId(Long siteId) + { + this.siteId = siteId; + } + + public String getUnionAlias() + { + return unionAlias; + } + + public void setUnionAlias(String unionAlias) + { + this.unionAlias = unionAlias; + } + + public String getPid() + { + return pid; + } + + public void setPid(String pid) + { + this.pid = pid; + } + + public Long getCid1() + { + return cid1; + } + + public void setCid1(Long cid1) + { + this.cid1 = cid1; + } + + public Long getCid2() + { + return cid2; + } + + public void setCid2(Long cid2) + { + this.cid2 = cid2; + } + + public Long getCid3() + { + return cid3; + } + + public void setCid3(Long cid3) + { + this.cid3 = cid3; + } + + public String getSubUnionId() + { + return subUnionId; + } + + public void setSubUnionId(String subUnionId) + { + this.subUnionId = subUnionId; + } + + public String getUnionTag() + { + return unionTag; + } + + public void setUnionTag(String unionTag) + { + this.unionTag = unionTag; + } + + public Long getPopId() + { + return popId; + } + + public void setPopId(Long popId) + { + this.popId = popId; + } + + public String getExt1() + { + return ext1; + } + + public void setExt1(String ext1) + { + this.ext1 = ext1; + } + + public String getPayMonth() + { + return payMonth; + } + + public void setPayMonth(String payMonth) + { + this.payMonth = payMonth; + } + + public Long getCpActId() + { + return cpActId; + } + + public void setCpActId(Long cpActId) + { + this.cpActId = cpActId; + } + + public Integer getUnionRole() + { + return unionRole; + } + + public void setUnionRole(Integer unionRole) + { + this.unionRole = unionRole; + } + + public Double getGiftCouponOcsAmount() + { + return giftCouponOcsAmount; + } + + public void setGiftCouponOcsAmount(Double giftCouponOcsAmount) + { + this.giftCouponOcsAmount = giftCouponOcsAmount; + } + + public String getGiftCouponKey() + { + return giftCouponKey; + } + + public void setGiftCouponKey(String giftCouponKey) + { + this.giftCouponKey = giftCouponKey; + } + + public String getBalanceExt() + { + return balanceExt; + } + + public void setBalanceExt(String balanceExt) + { + this.balanceExt = balanceExt; + } + + public String getSign() + { + return sign; + } + + public void setSign(String sign) + { + this.sign = sign; + } + + public Double getProPriceAmount() + { + return proPriceAmount; + } + + public void setProPriceAmount(Double proPriceAmount) + { + this.proPriceAmount = proPriceAmount; + } + + public Long getRid() + { + return rid; + } + + public void setRid(Long rid) + { + this.rid = rid; + } + + public Long getGoodsInfoId() + { + return goodsInfoId; + } + + public void setGoodsInfoId(Long goodsInfoId) + { + this.goodsInfoId = goodsInfoId; + } + + public Integer getExpressStatus() + { + return expressStatus; + } + + public void setExpressStatus(Integer expressStatus) + { + this.expressStatus = expressStatus; + } + + public Long getChannelId() + { + return channelId; + } + + public void setChannelId(Long channelId) + { + this.channelId = channelId; + } + + public String getSkuTag() + { + return skuTag; + } + + public void setSkuTag(String skuTag) + { + this.skuTag = skuTag; + } + + public String getItemId() + { + return itemId; + } + + public void setItemId(String itemId) + { + this.itemId = itemId; + } + + public String getCallerItemId() + { + return callerItemId; + } + + public void setCallerItemId(String callerItemId) + { + this.callerItemId = callerItemId; + } + + public String getOrderTag() + { + return orderTag; + } + + public void setOrderTag(String orderTag) + { + this.orderTag = orderTag; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java new file mode 100644 index 0000000..b4db167 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.jarvis.mapper; + +import com.ruoyi.jarvis.domain.OrderRows; + +import java.util.List; + +/** + * 京粉订单Mapper接口 + * + * @author ruoyi + */ +public interface OrderRowsMapper +{ + /** + * 查询京粉订单 + * + * @param id 京粉订单主键 + * @return 京粉订单 + */ + public OrderRows selectOrderRowsById(String id); + + /** + * 查询京粉订单列表 + * + * @param orderRows 京粉订单 + * @return 京粉订单集合 + */ + public List selectOrderRowsList(OrderRows orderRows); + + /** + * 新增京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + public int insertOrderRows(OrderRows orderRows); + + /** + * 修改京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + public int updateOrderRows(OrderRows orderRows); + + /** + * 删除京粉订单 + * + * @param id 京粉订单主键 + * @return 结果 + */ + public int deleteOrderRowsById(String id); + + /** + * 批量删除京粉订单 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderRowsByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.xml b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.xml new file mode 100644 index 0000000..1339a01 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/OrderRowsMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, order_id, parent_id, order_time, finish_time, modify_time, order_emt, plus, union_id, sku_id, sku_name, sku_num, sku_return_num, sku_frozen_num, price, commission_rate, sub_side_rate, subsidy_rate, final_rate, estimate_cos_price, estimate_fee, actual_cos_price, actual_fee, valid_code, trace_type, position_id, site_id, union_alias, pid, cid1, cid2, cid3, sub_union_id, union_tag, pop_id, ext1, pay_month, cp_act_id, union_role, gift_coupon_ocs_amount, gift_coupon_key, balance_ext, sign, pro_price_amount, rid, goods_info_id, express_status, channel_id, sku_tag, item_id, caller_item_id, order_tag from order_rows + + + + + + + + insert into order_rows + + id, + order_id, + parent_id, + order_time, + finish_time, + modify_time, + order_emt, + plus, + union_id, + sku_id, + sku_name, + sku_num, + sku_return_num, + sku_frozen_num, + price, + commission_rate, + sub_side_rate, + subsidy_rate, + final_rate, + estimate_cos_price, + estimate_fee, + actual_cos_price, + actual_fee, + valid_code, + trace_type, + position_id, + site_id, + union_alias, + pid, + cid1, + cid2, + cid3, + sub_union_id, + union_tag, + pop_id, + ext1, + pay_month, + cp_act_id, + union_role, + gift_coupon_ocs_amount, + gift_coupon_key, + balance_ext, + sign, + pro_price_amount, + rid, + goods_info_id, + express_status, + channel_id, + sku_tag, + item_id, + caller_item_id, + order_tag, + + + #{id}, + #{orderId}, + #{parentId}, + #{orderTime}, + #{finishTime}, + #{modifyTime}, + #{orderEmt}, + #{plus}, + #{unionId}, + #{skuId}, + #{skuName}, + #{skuNum}, + #{skuReturnNum}, + #{skuFrozenNum}, + #{price}, + #{commissionRate}, + #{subSideRate}, + #{subsidyRate}, + #{finalRate}, + #{estimateCosPrice}, + #{estimateFee}, + #{actualCosPrice}, + #{actualFee}, + #{validCode}, + #{traceType}, + #{positionId}, + #{siteId}, + #{unionAlias}, + #{pid}, + #{cid1}, + #{cid2}, + #{cid3}, + #{subUnionId}, + #{unionTag}, + #{popId}, + #{ext1}, + #{payMonth}, + #{cpActId}, + #{unionRole}, + #{giftCouponOcsAmount}, + #{giftCouponKey}, + #{balanceExt}, + #{sign}, + #{proPriceAmount}, + #{rid}, + #{goodsInfoId}, + #{expressStatus}, + #{channelId}, + #{skuTag}, + #{itemId}, + #{callerItemId}, + #{orderTag}, + + + + + update order_rows + + order_id = #{orderId}, + parent_id = #{parentId}, + order_time = #{orderTime}, + finish_time = #{finishTime}, + modify_time = #{modifyTime}, + order_emt = #{orderEmt}, + plus = #{plus}, + union_id = #{unionId}, + sku_id = #{skuId}, + sku_name = #{skuName}, + sku_num = #{skuNum}, + sku_return_num = #{skuReturnNum}, + sku_frozen_num = #{skuFrozenNum}, + price = #{price}, + commission_rate = #{commissionRate}, + sub_side_rate = #{subSideRate}, + subsidy_rate = #{subsidyRate}, + final_rate = #{finalRate}, + estimate_cos_price = #{estimateCosPrice}, + estimate_fee = #{estimateFee}, + actual_cos_price = #{actualCosPrice}, + actual_fee = #{actualFee}, + valid_code = #{validCode}, + trace_type = #{traceType}, + position_id = #{positionId}, + site_id = #{siteId}, + union_alias = #{unionAlias}, + pid = #{pid}, + cid1 = #{cid1}, + cid2 = #{cid2}, + cid3 = #{cid3}, + selectOrderRowsList(OrderRows orderRows); + + /** + * 新增京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + public int insertOrderRows(OrderRows orderRows); + + /** + * 修改京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + public int updateOrderRows(OrderRows orderRows); + + /** + * 批量删除京粉订单 + * + * @param ids 需要删除的京粉订单主键集合 + * @return 结果 + */ + public int deleteOrderRowsByIds(String[] ids); + + /** + * 删除京粉订单信息 + * + * @param id 京粉订单主键 + * @return 结果 + */ + public int deleteOrderRowsById(String id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderRowsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderRowsServiceImpl.java new file mode 100644 index 0000000..3213d85 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderRowsServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.jarvis.service.impl; + +import java.util.List; + +import com.ruoyi.jarvis.domain.OrderRows; +import com.ruoyi.jarvis.mapper.OrderRowsMapper; +import com.ruoyi.jarvis.service.IOrderRowsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 京粉订单Service业务层处理 + * + * @author ruoyi + */ +@Service +public class OrderRowsServiceImpl implements IOrderRowsService +{ + @Autowired + private OrderRowsMapper orderRowsMapper; + + /** + * 查询京粉订单 + * + * @param id 京粉订单主键 + * @return 京粉订单 + */ + @Override + public OrderRows selectOrderRowsById(String id) + { + return orderRowsMapper.selectOrderRowsById(id); + } + + /** + * 查询京粉订单列表 + * + * @param orderRows 京粉订单 + * @return 京粉订单 + */ + @Override + public List selectOrderRowsList(OrderRows orderRows) + { + return orderRowsMapper.selectOrderRowsList(orderRows); + } + + /** + * 新增京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + @Override + public int insertOrderRows(OrderRows orderRows) + { + return orderRowsMapper.insertOrderRows(orderRows); + } + + /** + * 修改京粉订单 + * + * @param orderRows 京粉订单 + * @return 结果 + */ + @Override + public int updateOrderRows(OrderRows orderRows) + { + return orderRowsMapper.updateOrderRows(orderRows); + } + + /** + * 批量删除京粉订单 + * + * @param ids 需要删除的京粉订单主键 + * @return 结果 + */ + @Override + public int deleteOrderRowsByIds(String[] ids) + { + return orderRowsMapper.deleteOrderRowsByIds(ids); + } + + /** + * 删除京粉订单信息 + * + * @param id 京粉订单主键 + * @return 结果 + */ + @Override + public int deleteOrderRowsById(String id) + { + return orderRowsMapper.deleteOrderRowsById(id); + } +}