925116093-qq.com
/
javacodeadmin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2025008071805

This commit is contained in:
张潘 2025-08-24 15:20:36 +08:00
parent 50216a1806
commit 2892ce9efc
16 changed files with 1047 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
ruoyi-system/src/main/java/com/ruoyi/system/controller/DiyCityController.java
View File

@ -26,6 +26,8 @@ import com.ruoyi.system.service.IDiyCityService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 自定义地区Controller
@ -37,6 +39,8 @@ import java.util.Objects;
@RequestMapping("/system/DiyCity")
public class DiyCityController extends BaseController
{
private static final Logger logger = LoggerFactory.getLogger(DiyCityController.class);
@Autowired
private IDiyCityService diyCityService;
@ -70,36 +74,61 @@ public class DiyCityController extends BaseController
@PreAuthorize("@ss.hasPermi('system:DiyCity:query')")
@GetMapping("/getTreeData")
public AjaxResult getTreeData() {
List<DiyCity> list = diyCityService.selectDiyCityList(new DiyCity());
try {
List<DiyCity> list = diyCityService.selectDiyCityList(new DiyCity());
if (list == null || list.isEmpty()) {
return success(new ArrayList<>());
}
List<Map<String, Object>> rootList = new ArrayList<>();
for (DiyCity city : list) {
Long parentId = city.getParentId();
Long id = Long.valueOf(city.getId());
// 一级节点
if (parentId == null || parentId == 0L) {
// 使用Map优化查找性能
Map<Long, Map<String, Object>> nodeMap = new HashMap<>();
List<Map<String, Object>> rootList = new ArrayList<>();
// 第一步：创建所有节点
for (DiyCity city : list) {
Map<String, Object> node = toMap(city);
// 组装children
List<Map<String, Object>> children = new ArrayList<>();
for (DiyCity child : list) {
Long childParentId = child.getParentId();
if (id != null && Objects.equals(id, childParentId)) {
children.add(toMap(child));
node.put("children", new ArrayList<>());
nodeMap.put(city.getId().longValue(), node);
}
// 第二步：构建树形结构
for (DiyCity city : list) {
Long parentId = city.getParentId();
Long id = city.getId().longValue();
if (parentId == null || parentId == 0L) {
// 根节点
rootList.add(nodeMap.get(id));
} else {
// 子节点，添加到父节点的children中
Map<String, Object> parentNode = nodeMap.get(parentId);
if (parentNode != null) {
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) parentNode.get("children");
children.add(nodeMap.get(id));
}
}
node.put("children", children);
rootList.add(node);
}
return success(rootList);
} catch (Exception e) {
logger.error("获取树形数据失败", e);
return error("获取树形数据失败: " + e.getMessage());
}
return success(rootList);
}
private Map<String, Object> toMap(DiyCity city) {
Map<String, Object> map = new HashMap<>();
map.put("id", city.getId());
map.put("label", city.getTitle());
map.put("title", city.getTitle()); // 兼容前端
map.put("parentId", city.getParentId());
// 其他字段按需添加
map.put("order", city.getOrder());
map.put("lat", city.getLat());
map.put("lng", city.getLng());
map.put("createdAt", city.getCreatedAt());
map.put("updatedAt", city.getUpdatedAt());
return map;
}
/**
@ -122,7 +151,34 @@ public class DiyCityController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id)
{
return success(diyCityService.selectDiyCityById(id));
try {
DiyCity diyCity = diyCityService.selectDiyCityById(id);
if (diyCity == null) {
return error("地区不存在");
}
return success(diyCity);
} catch (Exception e) {
logger.error("获取地区详情失败", e);
return error("获取地区详情失败: " + e.getMessage());
}
}
/**
* 获取指定地区的子地区列表
*/
@PreAuthorize("@ss.hasPermi('system:DiyCity:query')")
@GetMapping("/children/{parentId}")
public AjaxResult getChildren(@PathVariable("parentId") Long parentId)
{
try {
DiyCity query = new DiyCity();
query.setParentId(parentId);
List<DiyCity> children = diyCityService.selectDiyCityList(query);
return success(children);
} catch (Exception e) {
logger.error("获取子地区列表失败", e);
return error("获取子地区列表失败: " + e.getMessage());
}
}
/**
@ -133,7 +189,26 @@ public class DiyCityController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody DiyCity diyCity)
{
return toAjax(diyCityService.insertDiyCity(diyCity));
try {
// 验证必填字段
if (diyCity.getTitle() == null || diyCity.getTitle().trim().isEmpty()) {
return error("地区名称不能为空");
}
// 检查同级下是否有重名
DiyCity query = new DiyCity();
query.setParentId(diyCity.getParentId());
query.setTitle(diyCity.getTitle());
List<DiyCity> existing = diyCityService.selectDiyCityList(query);
if (existing != null && !existing.isEmpty()) {
return error("同级下已存在相同名称的地区");
}
return toAjax(diyCityService.insertDiyCity(diyCity));
} catch (Exception e) {
logger.error("新增自定义地区失败", e);
return error("新增失败: " + e.getMessage());
}
}
/**
@ -144,7 +219,38 @@ public class DiyCityController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody DiyCity diyCity)
{
return toAjax(diyCityService.updateDiyCity(diyCity));
try {
// 验证必填字段
if (diyCity.getId() == null) {
return error("地区ID不能为空");
}
if (diyCity.getTitle() == null || diyCity.getTitle().trim().isEmpty()) {
return error("地区名称不能为空");
}
// 检查是否将父级设置为自己或自己的子级（防止循环引用）
if (diyCity.getParentId() != null && diyCity.getParentId().equals(diyCity.getId().longValue())) {
return error("不能将父级设置为自己");
}
// 检查同级下是否有重名（排除自己）
DiyCity query = new DiyCity();
query.setParentId(diyCity.getParentId());
query.setTitle(diyCity.getTitle());
List<DiyCity> existing = diyCityService.selectDiyCityList(query);
if (existing != null && !existing.isEmpty()) {
for (DiyCity item : existing) {
if (!item.getId().equals(diyCity.getId())) {
return error("同级下已存在相同名称的地区");
}
}
}
return toAjax(diyCityService.updateDiyCity(diyCity));
} catch (Exception e) {
logger.error("修改自定义地区失败", e);
return error("修改失败: " + e.getMessage());
}
}
/**
@ -155,7 +261,20 @@ public class DiyCityController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids)
{
return toAjax(diyCityService.deleteDiyCityByIds(ids));
try {
// 检查是否有子节点
for (Integer id : ids) {
List<DiyCity> children = diyCityService.selectDiyCityList(new DiyCity() {{ setParentId(id.longValue()); }});
if (children != null && !children.isEmpty()) {
return error("无法删除地区ID " + id + "，该地区下还有子地区，请先删除子地区");
}
}
return toAjax(diyCityService.deleteDiyCityByIds(ids));
} catch (Exception e) {
logger.error("删除自定义地区失败", e);
return error("删除失败: " + e.getMessage());
}
}
/**

18
ruoyi-system/src/main/java/com/ruoyi/system/controller/GoodsOrderController.java
View File

@ -113,6 +113,15 @@ public class GoodsOrderController extends BaseController {
for (GoodsOrder order : orders) {
if (order.getProductId() != null) {
try {
UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(order.getMainOrderId());
if (usersPayBefor != null) {
order.setWxmoney(usersPayBefor.getWxmoney());
order.setYemoney(usersPayBefor.getYemoney());
order.setMembermoney(usersPayBefor.getMembermoney());
order.setCouponmoney(usersPayBefor.getCouponmoney());
order.setReturnmoney(usersPayBefor.getReturnmoney());
}
ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
if (serviceGoods != null) {
// 补充商品详细信息
@ -227,7 +236,14 @@ public class GoodsOrderController extends BaseController {
goodsOrderdata.setDeliveryName(siteDelivery.getTitle());
}
}
UsersPayBefor usersPayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(goodsOrderdata.getMainOrderId());
if (usersPayBefor != null) {
goodsOrderdata.setWxmoney(usersPayBefor.getWxmoney());
goodsOrderdata.setYemoney(usersPayBefor.getYemoney());
goodsOrderdata.setMembermoney(usersPayBefor.getMembermoney());
goodsOrderdata.setCouponmoney(usersPayBefor.getCouponmoney());
goodsOrderdata.setReturnmoney(usersPayBefor.getReturnmoney());
}
Users users = usersService.selectUsersById(goodsOrderdata.getUid());
if (users != null) {
goodsOrderdata.setUname(users.getName());

5
ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
View File

@ -409,7 +409,10 @@ public class OrderController extends BaseController {
logJson.put("type",9);
orderdata.setLogJson(logJson.toJSONString());
orderdata.setJsonStatus(0);
orderdata.setFileData(order.getFileData());
if(StringUtils.isNotBlank(order.getFileData())){
orderdata.setFileData(AppletControllerUtil.convertToJSONArray(order.getFileData()).toJSONString());
}
//orderdata.setFileData(order.getFileData());
orderdata.setOdertype(0);
orderdata.setReamk(order.getReamk());
orderdata.setBigtype(1);

29
ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/ScheduledTaskUtil.java
View File

@ -126,6 +126,7 @@ public class ScheduledTaskUtil implements CommandLineRunner {
cleanupSystemData();
healthCheck();
updateWorkerMoneyLook();
DispatchWorkerForOrder();
autoResumeWorkerOrderStatus(); // 添加师傅暂停状态自动恢复任务
log.info("定时任务自动执行完成");
}
@ -139,7 +140,7 @@ public class ScheduledTaskUtil implements CommandLineRunner {
* 师傅收益7天定时冻结的解冻
* 每10分钟执行一次
*/
@Scheduled(fixedRate = 10 * 60 * 1000) // 每10分钟执行一次
@Scheduled(fixedRate = 20 * 60 * 1000) // 每10分钟执行一次
public void updateWorkerMoneyLook() {
String taskName = "订单状态超时检查";
long startTime = System.currentTimeMillis();
@ -156,6 +157,32 @@ public class ScheduledTaskUtil implements CommandLineRunner {
/**
* 派单10分钟一次对没有派单的进行派单
* 每10分钟执行一次
*/
@Scheduled(fixedRate = 10 * 60 * 1000) // 每10分钟执行一次
public void DispatchWorkerForOrder() {
String taskName = "订单派单检查并重新派单";
long startTime = System.currentTimeMillis();
try {
Order order = new Order();
order.setStatus(1L);
order.setIsAccept(0);
order.setQiangdan("1");
List<Order> orders = orderService.selectOrderList(order);
for (Order orderdata : orders) {
DispatchUtil.dispatchOrder(orderdata.getId());
}
} catch (Exception e) {
log.error("{}任务执行失败", taskName, e);
updateTaskStatistics(taskName, false, System.currentTimeMillis() - startTime);
}
}
/**
* 订单派单超时处理任务
* 每5分钟执行一次，检查派单超过20分钟的订单

2
ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WorkerCommissionUtil.java
View File

@ -834,7 +834,7 @@ public class WorkerCommissionUtil {
BigDecimal newCommission = currentCommission.add(finalCommissionWithDoorFee);
worker.setCommission(newCommission);
//累计分佣
worker.setTotalComm(worker.getTotalComm().add(newCommission));
worker.setTotalComm(worker.getTotalComm().add(finalCommissionWithDoorFee));
// 5. 更新师傅信息
int updateResult = usersService.updateUsers(worker);

36
ruoyi-system/src/main/java/com/ruoyi/system/domain/GoodsOrder.java
View File

@ -117,6 +117,10 @@ public class GoodsOrder extends BaseEntity
/** 排序 */
private Integer forserviceid;
private BigDecimal wxmoney;
private BigDecimal yemoney;
private BigDecimal membermoney;
private BigDecimal couponmoney;
/** 支付时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@ -753,6 +757,38 @@ public class GoodsOrder extends BaseEntity
this.deliveryName = deliveryName;
}
public BigDecimal getCouponmoney() {
return couponmoney;
}
public void setCouponmoney(BigDecimal couponmoney) {
this.couponmoney = couponmoney;
}
public BigDecimal getMembermoney() {
return membermoney;
}
public void setMembermoney(BigDecimal membermoney) {
this.membermoney = membermoney;
}
public BigDecimal getYemoney() {
return yemoney;
}
public void setYemoney(BigDecimal yemoney) {
this.yemoney = yemoney;
}
public BigDecimal getWxmoney() {
return wxmoney;
}
public void setWxmoney(BigDecimal wxmoney) {
this.wxmoney = wxmoney;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

10
ruoyi-system/src/main/resources/mapper/system/ServiceCateMapper.xml
View File

@ -32,13 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="parentId != null"> and parent_id=#{parentId}</if>
<if test="city != null and city != ''"> and JSON_CONTAINS(city, #{city})</if>
</where>
order by parent_id ASC, sort ASC
order by sort ASC
</select>
<select id="selectServiceCateCiKaList" resultMap="ServiceCateResult">
<include refid="selectServiceCateVo"/>
where id in (select card.type from user_secondary_card card where card.status='1' )
order by parent_id ASC, sort ASC
order by sort ASC
</select>
@ -46,21 +46,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectServiceCatepintuanList" resultMap="ServiceCateResult">
<include refid="selectServiceCateVo"/>
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.isgroup='1' )
order by parent_id ASC, sort ASC
order by sort ASC
</select>
<select id="selectServiceCateMiaoshaList" resultMap="ServiceCateResult">
<include refid="selectServiceCateVo"/>
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.isfixed='1' )
order by parent_id ASC, sort ASC
order by sort ASC
</select>
<select id="selectServiceCateBaojiaList" resultMap="ServiceCateResult">
<include refid="selectServiceCateVo"/>
where id in (select card.first_cate_id from service_goods card where card.status='1' and card.type='1' and card.servicetype='2' )
order by parent_id ASC, sort ASC
order by sort ASC
</select>

4
ruoyi-system/src/main/resources/mapper/system/ServiceGoodsMapper.xml
View File

@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isgroup != null "> and isgroup = #{isgroup}</if>
</where>
order by id desc
order by sort ASC
</select>
@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
order by created_at desc
order by sort ASC
</select>

2
ruoyi-ui/src/api/system/DiyCity.js
View File

@ -55,7 +55,7 @@ export function delDiyCity(id) {
// 查询城市树结构
export function getDiyCityTree() {
return request({
url: '/system/DiyCity/tree',
url: '/system/DiyCity/getTreeData',
method: 'get'
})
}

2
ruoyi-ui/src/views/system/AdvImg/index.vue
View File

@ -290,7 +290,7 @@ export default {
},
handlefenleiStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
return changefenleiStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")

102
ruoyi-ui/src/views/system/DiyCity/index.vue
View File

@ -87,7 +87,7 @@
</template>
<script>
import { listDiyCity, getDiyCity, delDiyCity, addDiyCity, updateDiyCity,getTreeDataList } from "@/api/system/DiyCity"
import { listDiyCity, getDiyCity, delDiyCity, addDiyCity, updateDiyCity, getDiyCityTree } from "@/api/system/DiyCity"
export default {
name: "DiyCity",
@ -152,6 +152,7 @@ export default {
amap: null,
marker: null,
geocoder: null,
mapInited: false,
defaultProps: {
children: 'children',
label: 'label'
@ -207,10 +208,19 @@ export default {
},
gettreeDataList(){
getTreeDataList().then(response => {
this.treeDataList=response.data
// 使用后端的树形数据接口
getDiyCityTree().then(response => {
if (response.data && response.data.length > 0) {
this.treeDataList = response.data
} else {
this.treeDataList = []
}
// 初始化时不展开任何节点
this.expandedKeys = []
}).catch(error => {
console.error('获取树数据失败:', error)
// 如果树形接口失败，回退到列表接口构建树形结构
this.fallbackToBuildTree()
})
},
@ -255,12 +265,16 @@ export default {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
this.gettreeDataList() // 刷新树结构
this.loadParentOptions() // 刷新父级选项
})
} else {
addDiyCity(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
this.gettreeDataList() // 刷新树结构
this.loadParentOptions() // 刷新父级选项
})
}
}
@ -269,10 +283,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除自定义地区编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除自定义地区编号为"' + ids + '"的数据项？').then(() => {
return delDiyCity(ids)
}).then(() => {
this.getList()
this.gettreeDataList() // 刷新树结构
this.loadParentOptions() // 刷新父级选项
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
@ -378,6 +394,61 @@ export default {
this.gettreeDataList(); // 重新获取数据
},
/** 处理节点点击事件 */
handleNodeClick(data, node) {
// 可以在这里添加节点点击的逻辑
console.log('点击节点:', data, node);
},
/** 回退到构建树形结构的方法 */
fallbackToBuildTree() {
listDiyCity({pageSize: 1000}).then(response => {
if (response.rows && response.rows.length > 0) {
this.treeDataList = this.buildTreeData(response.rows)
} else {
this.treeDataList = []
}
this.expandedKeys = []
}).catch(error => {
console.error('回退构建树形结构也失败:', error)
this.treeDataList = []
this.expandedKeys = []
})
},
/** 构建树形结构数据 */
buildTreeData(dataList) {
const treeData = []
const dataMap = new Map()
// 先建立ID映射
dataList.forEach(item => {
dataMap.set(item.id, {
id: item.id,
label: item.title,
parentId: item.parentId,
children: []
})
})
// 构建树形结构
dataList.forEach(item => {
const node = dataMap.get(item.id)
if (item.parentId === null || item.parentId === 0) {
// 根节点
treeData.push(node)
} else {
// 子节点
const parent = dataMap.get(item.parentId)
if (parent) {
parent.children.push(node)
}
}
})
return treeData
},
decreaseOrder() {
if (this.form.order > 0) {
this.form.order--
@ -393,23 +464,23 @@ export default {
},
initMap() {
// 销毁旧地图和事件，防止重复绑定
if (this.map) {
this.map.destroy()
this.map = null
if (this.amap) {
this.amap.destroy()
this.amap = null
this.marker = null
this.geocoder = null
this.mapInited = false
}
this.map = new AMap.Map('map', {
this.amap = new AMap.Map('map', {
zoom: 16,
center: [this.form.longitude || 108.94141, this.form.latitude || 34.209883],
})
this.geocoder = new AMap.Geocoder()
// if (this.form.longitude && this.form.latitude) {
// this.setMapMarker([this.form.longitude, this.form.latitude]);
// this.map.setCenter([this.form.longitude, this.form.latitude]);
// this.amap.setCenter([this.form.longitude, this.form.latitude]);
// }
this.map.on('click', (e) => {
this.amap.on('click', (e) => {
const lnglat = [e.lnglat.lng, e.lnglat.lat]
this.setMapMarker(lnglat)
this.form.longitude = e.lnglat.lng
@ -429,7 +500,7 @@ export default {
}
this.marker = new AMap.Marker({
position: lnglat,
map: this.map,
map: this.amap,
})
},
searchMapAddress() {
@ -445,7 +516,7 @@ export default {
if (status === 'complete' && result.geocodes.length) {
const lnglat = result.geocodes[0].location
this.setMapMarker([lnglat.lng, lnglat.lat])
this.map.setCenter([lnglat.lng, lnglat.lat])
this.amap.setCenter([lnglat.lng, lnglat.lat])
this.form.longitude = lnglat.lng
this.form.latitude = lnglat.lat
this.latlng = `${lnglat.lng},${lnglat.lat}`
@ -462,9 +533,12 @@ export default {
})
},
loadParentOptions() {
// 这里假设用listDiyCity获取所有可选父级
listDiyCity({parentId:0}).then(res => {
// 获取所有可选父级
listDiyCity({parentId: 0, pageSize: 1000}).then(res => {
this.parentOptions = res.rows || []
}).catch(error => {
console.error('加载父级选项失败:', error)
this.parentOptions = []
})
},
}

49
ruoyi-ui/src/views/system/GoodsOrder/details.vue
View File

@ -12,7 +12,7 @@
<div v-if="loading" class="loading-container">
<el-skeleton :rows="10" animated />
</div>
<!-- 订单详情内容 -->
<div v-else-if="orderData && Object.keys(orderData).length > 0" class="box">
<!-- 订单和金额信息卡片 -->
@ -42,6 +42,18 @@
<label>用户电话：</label>
<span class="value">{{ orderData.uphone || "未知" }}</span>
</div>
<div class="info-item">
<label>订单单号：</label>
<span class="value">{{ orderData.mainOrderId || "未知" }}</span>
</div>
<div class="info-item">
<label>下单时间：</label>
<span class="value">{{ orderData.createdAt || "未知" }}</span>
</div>
<!-- <div class="info-item">-->
<!-- <label>下单商品：</label>-->
<!-- <span class="value">{{ orderData.productName || "未知" }}</span>-->
<!-- </div>-->
</div>
</el-col>
<!-- 基础金额信息 -->
@ -91,7 +103,17 @@
}}</span
>
</div>
<div class="info-item">
<label>商品数量：</label>
<span class="value amount-good"
>￥{{
orderData.num
? orderData.num.toFixed(2)
: "0.00"
}}</span
>
</div>
</div>
</el-col>
@ -138,7 +160,16 @@
}}</span
>
</div>
<div class="info-item">
<label>退款金额：</label>
<span class="value amount-coupon"
>￥{{
orderData.returnmoney
? orderData.returnmoney.toFixed(2)
: "0.00"
}}</span
>
</div>
</div>
</el-col>
</el-row>
@ -185,7 +216,7 @@
<el-col :span="24">
<div class="info-item">
<label>地图位置：</label>
<AddressSelector
:longitude="orderData.longitude"
:latitude="orderData.latitude"
@ -240,7 +271,7 @@
<span class="value logistics-number">{{ orderData.deliveryNum || '未设置' }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="24" v-if="orderData.mark">
@ -485,7 +516,7 @@ export default {
if (response.code === 200) {
this.orderData = response.data;
console.log("获取到的订单详情:", this.orderData);
// 如果订单有主订单ID，则获取子订单
if (this.orderData.mainOrderId) {
await this.fetchChildrenOrders(this.orderData.mainOrderId);
@ -718,17 +749,17 @@ export default {
console.warn("SKU数据解析失败:", e);
}
}
// 其次使用商品图片
if (row.productImage) {
return row.productImage;
}
// 最后使用pic字段
if (row.pic) {
return row.pic;
}
// 都没有则返回空字符串
return '';
},

931
ruoyi-ui/src/views/system/Order/components/OrderDetailDialog.vue
View File

File diff suppressed because it is too large Load Diff

4
ruoyi-ui/src/views/system/SiteConfig/index.vue
View File

@ -157,7 +157,7 @@
<el-form :model="timeForm" label-width="120px" class="tab-form">
<el-form-item label="每月提现时间">
<el-select v-model="timeForm.withdrawDays" multiple placeholder="请选择日期" style="width: 300px">
<el-option v-for="d in 31" :key="d" :label="d + '号'" :value="d + '号'" />
<el-option v-for="d in 31" :key="d" :label="d + '号'" :value="d.toString()" />
</el-select>
</el-form-item>
<el-form-item label="定时接单时长">
@ -1051,7 +1051,7 @@ export default {
this.$message.success('提交成功（模拟）')
},
resetTime() {
this.timeForm = { withdrawDays: ['8号', '18号', '28号'], autoOrderMinutes: 10, cancelOrderDays: 7 }
this.timeForm = { withdrawDays: ['8', '18', '28'], autoOrderMinutes: 10, cancelOrderDays: 7 }
},
resetMember() {
this.memberForm = { member: '', memberRule: '', recharge: '' }

10
ruoyi-ui/src/views/system/SiteDelivery/index.vue
View File

@ -17,8 +17,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -77,7 +77,7 @@
<el-table-column label="名称" align="center" prop="title" />
<el-table-column label="编号" align="center" prop="code" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="状态" width="85" align="center">
<template slot-scope="scope">
<el-switch
@ -117,7 +117,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -244,7 +244,7 @@ export default {
// 任务状态修改
handlefenleiStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
return changefenleiStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")

6
ruoyi-ui/src/views/system/SiteSkill/index.vue
View File

@ -66,7 +66,7 @@
<el-table-column label="ID" align="center" width="55" prop="id" />
<el-table-column label="名称" align="center" prop="title" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="状态" width="85" align="center">
<template slot-scope="scope">
<el-switch
@ -140,7 +140,7 @@
<div class="dialog-footer custom-footer">
<el-button @click="resetForm">重置</el-button>
<div class="footer-right">
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</div>
@ -258,7 +258,7 @@ export default {
// 任务状态修改
handlefenleiStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.title + '"状态吗？').then(function() {
this.$modal.confirm('确认要操作' + row.title + '状态吗？').then(function() {
return changefenleiStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")