CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-08-05 17:51:28 +08:00
parent 3ec3e9e315
commit b2996bd5b6
5 changed files with 81 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
View File

@@ -1,17 +1,11 @@
package com.ruoyi.web.controller.jarvis;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
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.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java
View File

@@ -107,7 +107,7 @@ public class SuperAdminController extends BaseController
superAdmin.setIsActive(1); // 只查询激活的管理员
List<SuperAdmin> list = superAdminService.selectSuperAdminList(superAdmin);
List<Map<String, Object>> optionList = list.stream()
.map(item -> {
.filter(item -> item.getUnionId() != null ).map(item -> {
Map<String, Object> map = new HashMap<>();
map.put("label", item.getName());
map.put("value", item.getUnionId());

5
ruoyi-system/pom.xml
View File

@@ -22,6 +22,11 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

526
ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
View File

@@ -2,12 +2,15 @@ package com.ruoyi.jarvis.domain;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import org.springframework.data.annotation.Transient;
/**
* 京粉订单对象 order_rows
*
* @author ruoyi
*/
@Data
public class OrderRows extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -84,6 +87,10 @@ public class OrderRows extends BaseEntity
/** 有效性 */
private Integer validCode;
/** 有效性多选值 */
@Transient
private Integer[] validCodes;
/** 跟踪类型 */
private Integer traceType;
@@ -168,523 +175,4 @@ public class OrderRows extends BaseEntity
/** 订单标签 */
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;
}
}

8
ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
View File

@@ -87,6 +87,13 @@
<if test="actualCosPrice != null "> and actual_cos_price = #{actualCosPrice}</if>
<if test="actualFee != null "> and actual_fee = #{actualFee}</if>
<if test="validCode != null "> and valid_code = #{validCode}</if>
<!-- 支持validCode多值查询 -->
<if test="validCodes != null and validCodes.length > 0">
and valid_code in
<foreach item="item" index="index" collection="validCodes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="traceType != null "> and trace_type = #{traceType}</if>
<if test="positionId != null "> and position_id = #{positionId}</if>
<if test="siteId != null "> and site_id = #{siteId}</if>
@@ -119,6 +126,7 @@
order by order_time desc
</select>
<select id="selectOrderRowsById" parameterType="String" resultMap="OrderRowsResult">
<include refid="selectOrderRowsVo"/>
where id = #{id}