Tenlion/system-ai-shop
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单信息

Browse Source
This commit is contained in:
1215525055@qq.com 2025-06-04 10:44:55 +08:00
parent 08a375019a
commit cba0fe09f3
13 changed files with 127 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsDTO.java
View File

@ -16,6 +16,8 @@ public class GoodsDTO {
@ApiModelProperty(name = "goodsId", value = "软著商品")
private String goodsId;
@ApiModelProperty(name = "userUsername", value = "软著商品")
private String userUsername;
@ApiModelProperty(name = "goodsLocalPhoto", value = "软著上架图片")
private String goodsLocalPhoto;
@ApiModelProperty(name = "goodsFlag", value = "软著标签")
@ -81,6 +83,14 @@ public class GoodsDTO {
@ApiModelProperty(name = "isDelete", value = "")
private Integer isDelete;
public String getUserUsername() {
return userUsername == null ? "" : userUsername.trim();
}
public void setUserUsername(String userUsername) {
this.userUsername = userUsername;
}
public String getGoodsLocalPhoto() {
return goodsLocalPhoto == null ? "" : goodsLocalPhoto.trim();
}

10
src/main/java/cn/com/tenlion/aishop/pojo/dtos/order/OrderDTO.java
View File

@ -20,6 +20,8 @@ public class OrderDTO {
private String orderId;
@ApiModelProperty(name = "GoodsDTO", value = "软著信息")
private GoodsSimpleDTO GoodsDTO;
@ApiModelProperty(name = "userUsername", value = "用户账号")
private String userUsername;
@ApiModelProperty(name = "orderNumber", value = "订单编号")
private String orderNumber;
@ApiModelProperty(name = "buyType", value = "购买人类型个人|企业")
@ -83,6 +85,14 @@ public class OrderDTO {
@ApiModelProperty(name = "correctionCount", value = "待补正数量")
private Integer waitCorrectionCount;
public String getUserUsername() {
return userUsername == null ? "" : userUsername.trim();
}
public void setUserUsername(String userUsername) {
this.userUsername = userUsername;
}
public Integer getWaitCorrectionCount() {
return waitCorrectionCount == null ? 0 : waitCorrectionCount;
}

2
src/main/java/cn/com/tenlion/aishop/service/goods/impl/GoodsServiceImpl.java
View File

@ -229,7 +229,7 @@ public class GoodsServiceImpl extends DefaultBaseService implements IGoodsServic
for(GoodsDTO dto : list) {
OrderDTO orderDTO = iOrderService.getOrderByGoodsId(dto.getGoodsId());
if (orderDTO != null && !orderDTO.getOrderStatus().equals("0")) {
dto.setGoodsOrderStatus("1");
dto.setGoodsOrderStatus(orderDTO.getOrderStatus());
}else{
dto.setGoodsOrderStatus("0");
}

4
src/main/resources/application-lanproxy.yml
View File

@ -101,7 +101,7 @@ file:
api-path:
# user-center: http://121.36.71.250:58085/operator
user-center: http://121.36.71.250:58038/operator
user-center: http://192.168.0.15:8091/operator
client-id: 290ec23667434aa289d07ff4e2491c12
client-secret: bStibC84cElYZCtNU2Zhd3dCeUpwMU5NaDZlbXhXTlFmR0pqcDhXMWZBdmxIdG9KZmEyTjJIRnI0dG1McEdEVA==
operator-plugin: https://www.aimzhu.com/operator-plugin/
@ -142,7 +142,7 @@ logging:
aishop:
# 账户系统地址
account-service-path: http://121.36.71.250:58085/operator
account-service-path: http://192.168.0.15:8091/operator
# 客户系统地址
copyright-service-path: http://121.36.71.250:58038/copyright
# 门户系统地址

20
src/main/resources/mybatis/mapper/apporder/app-order-mapper.xml
View File

@ -666,25 +666,17 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t2.user_username LIKE CONCAT('%', #{keywords}, '%')
OR
t1.company_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.app_order_no LIKE CONCAT('%', #{keywords}, '%')
OR
t1.app_name LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.company_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.app_order_no LIKE CONCAT('%', #{keywords}, '%')
OR
t1.app_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.proj_owner_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.proj_owner_identity LIKE CONCAT('%', #{keywords}, '%')
OR
t1.proj_owner_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.proj_owner_identity LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="appOrderIds != null and appOrderIds.size > 0">

13
src/main/resources/mybatis/mapper/goods/goods-mapper.xml
View File

@ -35,6 +35,7 @@
<result column="modified" property="modified"/>
<result column="gmt_modifir" property="gmtModifir"/>
<result column="is_delete" property="isDelete"/>
<result column="user_username" property="userUsername"/>
</resultMap>
<resultMap id="goodsBO" type="cn.com.tenlion.aishop.pojo.bos.goods.GoodsBO">
@ -455,9 +456,14 @@
t1.gmt_create,
t1.modified,
t1.gmt_modifir,
t1.is_delete
t1.is_delete,
t2.user_username AS user_username
FROM
shop_goods t1
LEFT JOIN
user t2
ON
t1.creator = t2.user_id
WHERE
t1.is_delete = 0
<if test="goodsGetType != null and goodsGetType != ''">
@ -475,6 +481,9 @@
<if test="goodsCheckStatus != null and goodsCheckStatus != ''">
AND t1.goods_check_status = #{goodsCheckStatus}
</if>
<if test="goodsStatus != null and goodsStatus != ''">
AND t1.goods_status = #{goodsStatus}
</if>
<if test="goodsFlag != null and goodsFlag != ''">
AND t1.goods_flag LIKE CONCAT('%', #{goodsFlag}, '%')
</if>
@ -492,6 +501,8 @@
</if>
<if test="keywords != null and keywords != ''">
AND (
t2.user_username LIKE CONCAT('%', #{keywords}, '%')
OR
t1.goods_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.goods_sub_name LIKE CONCAT('%', #{keywords}, '%')

11
src/main/resources/mybatis/mapper/order/order-mapper.xml
View File

@ -34,6 +34,7 @@
<result column="invoice_phone" property="invoicePhone"/>
<result column="cancel_time" property="cancelTime"/>
<result column="produce_photo" property="producePhoto"/>
<result column="user_username" property="userUsername"/>
</resultMap>
<resultMap id="orderBO" type="cn.com.tenlion.aishop.pojo.bos.order.OrderBO">
@ -468,13 +469,19 @@
t1.invoice_address,
t1.invoice_phone,
t1.cancel_time,
t1.produce_photo
t1.produce_photo,
t1.buy_user_id,
t3.user_username AS user_username
FROM
shop_order t1
LEFT JOIN
shop_goodsonline t2
ON
t1.goods_id = t2.goods_id AND t1.goods_vnumber = t2.goods_vnumber
LEFT JOIN
user t3
ON
t1.buy_user_id = t3.user_id
WHERE
1 = 1
<if test="sellUserId != null and sellUserId != ''">
@ -494,6 +501,8 @@
</if>
<if test="keywords != null and keywords != ''">
AND (
t3.user_username LIKE CONCAT('%', #{keywords}, '%')
OR
t1.order_number LIKE CONCAT('%', #{keywords}, '%')
OR
t2.goods_name LIKE CONCAT('%', #{keywords}, '%')

4
src/main/resources/templates/apporder/list.html
View File

@ -97,7 +97,7 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'appOrderId', width: 200, title: '订单号', align:'center',
{field: 'userUsername', width: 130, title: '用户账号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -106,7 +106,7 @@
return rowData;
}
},
{field: 'userUsername', width: 130, title: '用户账号', align:'center',
{field: 'appOrderId', width: 200, title: '订单号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {

7
src/main/resources/templates/correction/save.html
View File

@ -49,7 +49,7 @@
</label>
<div class="layui-input-block">
<input type="hidden" id="correctionFiles" name="correctionFiles">
<div class="layui-btn-container" id="correctionFilesFileBox" style="border: 1px solid #e6e6e6;"></div>
<div class="layui-btn-container" id="correctionFilesFileBox" style="border: 1px solid #e6e6e6;min-height: 120px;"></div>
<script id="correctionFilesFileDownload" type="text/html">
{{# var fileName = 'correctionFiles'; }}
{{# if(d[fileName] != '') { }}
@ -79,12 +79,15 @@
{{# } }}
</a>
<span class="upload-file-title">{{item.fileName}}</span>
<a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" style="position: absolute;top: 0px;right: 0px;" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="correctionFilesRemoveFile">
<i class="fa fa-trash-o"></i>
</a>
</div>
</span>
{{# } }}
{{# } }}
{{# if(d[fileName].length < 5) { }}
<div class="upload-file-box" style="width: auto; height: auto; padding: 5px;">
<div class="upload-file-box" style="width: auto; height: auto; padding: 5px; top: 22px;">
<a href="javascript:void(0);" lay-form-button data-explain="资料附件" data-name="correctionFiles" lay-filter="correctionFilesUploadFile">
<i class="fa fa-plus-square-o" style="font-size: 70px;"></i>
</a>

6
src/main/resources/templates/goods/check.html
View File

@ -40,7 +40,7 @@
<img id="logoImage2" src="assets/images/ruanzhu.jpg" style="height:74px;width:74px;" title="点击查看 原软著电子版">
<input type="hidden" id="goodsLocalPhoto" name="goodsLocalPhoto" >
</br>
<span style="white-space: nowrap; font-size: 11px" id="basicsLogoSpan2">点击查看 原软著电子版</span>
<span style="white-space: nowrap; font-size: 11px;color: blue" id="basicsLogoSpan2">点击查看 软著电子版(原扫描件)</span>
</div>
</div>
<div class="layui-col-lg3" style="border: 1px solid #C9C9C9;" id="basicsLogoSpanDIV">
@ -48,7 +48,7 @@
<img id="logoImage" src="assets/images/ruanzhu.jpg" style="height:74px;width:74px;" title="点击查看 上架软著电子版">
<input type="hidden" id="goodsPhoto" name="goodsPhoto" >
</br>
<span style="white-space: nowrap; font-size: 11px" id="basicsLogoSpan">点击编辑 上架软著电子版</span>
<span style="white-space: nowrap; font-size: 11px;color: blue" id="basicsLogoSpan">点击编辑 软著电子版(商品介绍)</span>
<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" style="top: 5px;position: absolute;right: 5px;" id="basicsLogoSpanDelete">
<i class="fa fa-lg fa-remove"></i> 删除
</button>
@ -310,7 +310,7 @@
$("#goodsDescription").val("");
var loadLayerIndex = top.dialog.msg("AI正在思考中...", {icon: 16, time: 4000, shade: 0.3});
//实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
var Socket= new WebSocket("http://106.74.34.136:8083/center/xf-socket");
var Socket= new WebSocket("ws://106.74.34.136:8083/center/xf-socket");
//打开事件
Socket.onopen = function() {
// 注册

51
src/main/resources/templates/goods/list-system.html
View File

@ -50,6 +50,13 @@
<option value="2">已通过</option>
</select>
</div>
<div class="layui-inline layui-form search-item" >
<select id="goodsStatus" name="goodsStatus">
<option value="">请选择上架状态</option>
<option value="1">已上架</option>
<option value="0">未上架</option>
</select>
</div>
<!--<div class="layui-inline layui-form search-item" id="goodsDevelopSelectTemplateBox" lay-filter="goodsDevelopSelectTemplateBox"></div>
<script type="text/html" id="goodsDevelopSelectTemplate">
<select id="goodsDevelop" name="goodsDevelop">
@ -80,7 +87,7 @@
<i class="fa fa-lg fa-check"></i> 著作权信息审核
</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="teJiaEvent">
<i class="fa fa-lg fa-star"></i> 今日特价
<i class="fa fa-lg fa-star"></i> 设置今日特价
</button>
</div>
</script>
@ -92,6 +99,10 @@
<script src="assets/layuiadmin/layui/layui.js"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script>
var openUser = function (userId) {
}
layui.config({
base: 'assets/layuiadmin/'
}).extend({
@ -153,7 +164,17 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'goodsNumber', width: 180, title: '软著编号', align:'center',
{field: 'userUsername', width: 130, title: '用户账号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
/*return `<a href="javaScript:openUser('${rowData}')">${rowData}</a>`;;*/
}
},
/* {field: 'goodsNumber', width: 180, title: '软著编号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -161,7 +182,7 @@
}
return rowData;
}
},
},*/
{field: 'goodsName', width: 280, title: '软著名称', align:'center',
templet: function(row) {
var rowData = row[this.field];
@ -207,6 +228,7 @@
var arr = rowData.split(",")
var rowData = '<div class="layui-btn-group">';
for(var i = 0 ; i < arr.length ; i++) {
if ( arr[i] != "0")
rowData += ' <button type="button" class="layui-btn layui-btn-xs layui-btn-normal">' + arr[i] + '</button>';
}
rowData += '</div>';
@ -231,20 +253,25 @@
return rowData;
}
},
{field: 'goodsStatus', width: 130, title: '著作权上架', align:'center', fixed: "right",
{field: 'goodsStatus', width: 180, title: '著作权上架', align:'center', fixed: "right",
templet: function(row) {
var goodsId = row["goodsId"];
var goodsOrderStatus = row["goodsOrderStatus"];
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
if(rowData == '1') {
if(goodsOrderStatus == "1") {
return '<b style="color: #4DAF29" id="checkLog" data-goodsid="' + goodsId + '" >已上架(交易中)</b>';
if (goodsOrderStatus == "1") {
return "<b style='color: orange'>已上架(买家待付款)</b>";
}else if (goodsOrderStatus == "2") {
return "<b style='color: red'>已上架(待填写资料)</b>";
}else if (goodsOrderStatus == "3") {
return "<b style='color: olive'>已上架(过户进行中)</b>";
}else if (goodsOrderStatus == "4") {
return "<b style='color: blue'>已上架(过户已完成)</b>";
}else{
return '<b style="color: #4DAF29" id="checkLog" data-goodsid="' + goodsId + '" >已上架</b>';
}
}else{
return '<b style="color: #dd4a68" id="checkLog" data-goodsid="' + goodsId + '" >未上架</b>';
}
}
},
@ -291,6 +318,9 @@
});
}
openUser = function (userId) {
}
// 事件 - 增删改
table.on('tool(dataTable)', function(obj) {
var layEvent = obj.event;
@ -323,7 +353,8 @@
goodsFlag: $('#goodsFlag').val(),
goodsDevelop: $('#goodsDevelop').val(),
goodsType: $('#goodsType').val(),
goodsCheckStatus: $('#goodsCheckStatus').val()
goodsCheckStatus: $('#goodsCheckStatus').val(),
goodsStatus: $('#goodsStatus').val(),
},
page: {
curr: currentPage

13
src/main/resources/templates/order/list.html
View File

@ -104,6 +104,15 @@
[
{type:'checkbox', fixed: 'left'},
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{field: 'userUsername', width: 130, title: '用户账号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'orderNumber', width: 180, title: '订单编号', align:'center',
templet: function(row) {
var rowData = row[this.field];
@ -122,7 +131,7 @@
return rowData.goodsName + " " + rowData.goodsVersion;
}
},
{field: 'payMoney', width: 150, title: '订单金额', align:'center',
{field: 'payMoney', width: 120, title: '订单金额', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -131,7 +140,7 @@
return rowData + "元";
}
},
{field: 'orderStatus', width: 180, title: '订单状态', align:'center',
{field: 'orderStatus', width: 120, title: '订单状态', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {

28
src/main/resources/templates/order/upload.html
View File

@ -29,7 +29,7 @@
<img id="logoImage" src="assets/images/ruanzhu.jpg" style="height:340px;width:240px;" title="">
<input type="hidden" id="goodsPhoto" name="goodsPhoto" >
</br>
<span style="white-space: nowrap; font-size: 11px" id="basicsLogoSpan">点击上传过户后新的的软著电子版</span>
<span style="white-space: nowrap; font-size: 11px;color: blue" id="basicsLogoSpan">点击图片 - 上传过户后新的的软著电子版</span>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
@ -42,6 +42,14 @@
</div>
</div>
</div>
<div class="layui-col-lg12 layui-col-xs12">
<div class="layui-form-item">
<label class="layui-form-label">软著证号</label>
<div class="layui-input-block">
<input type="text" id="goodsNumber" readonly name="goodsNumber" class="layui-input" value="" maxlength="100">
</div>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">软著简称</label>
@ -50,14 +58,6 @@
</div>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">软著证号</label>
<div class="layui-input-block">
<input type="text" id="goodsNumber" readonly name="goodsNumber" class="layui-input" value="" maxlength="100">
</div>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">软著版本</label>
@ -66,15 +66,15 @@
</div>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
<!-- <div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">取得时间</label>
<div class="layui-input-block">
<input type="text" id="goodsGetTime" readonly style="cursor: pointer" name="goodsGetTime" class="layui-input" value="" maxlength="50">
</div>
</div>
</div>
<div class="layui-col-lg6 layui-col-xs6">
</div>-->
<!--<div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">开发语言</label>
<div class="layui-input-block">
@ -89,7 +89,7 @@
<input type="text" id="goodsGetType" readonly style="cursor: pointer" name="goodsGetType" class="layui-input" value="" maxlength="50">
</div>
</div>
</div>
</div>-->
<div class="layui-col-lg6 layui-col-xs6">
<div class="layui-form-item">
<label class="layui-form-label">售卖价格</label>
@ -110,7 +110,7 @@
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">软著详情</label>
<div class="layui-input-block">
<textarea id="goodsDescription" readonly name="goodsDescription" class="layui-textarea"></textarea>
<textarea id="goodsDescription" style="min-height: 154px;" readonly name="goodsDescription" class="layui-textarea"></textarea>
</div>
</div>
</div>