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

项目更新,修改了沟通的BUG

Browse Source
This commit is contained in:
1215525055@qq.com 2025-05-29 16:17:09 +08:00
parent 173e0517f5
commit d6d641cc1b
7 changed files with 126 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/cn/com/tenlion/aishop/controller/app/api/goodsonline/GoodsonlineAppController.java
View File

@ -1,5 +1,6 @@
package cn.com.tenlion.aishop.controller.app.api.goodsonline;
import cn.com.tenlion.aishop.pojo.dtos.goods.GoodsSimpleDTO;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController;
import ink.wgink.interfaces.consts.ISystemConstant;
@ -110,6 +111,30 @@ public class GoodsonlineAppController extends DefaultBaseController {
return goodsonlineService.listPage(page);
}
@ApiOperation(value = "著作权商品分页列表", notes = "商品分页列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
/* @ApiImplicitParam(name = "goodsGetTime'", value = "取得时间 年", paramType = "query", dataType = "String"),*/
@ApiImplicitParam(name = "goodsGetType", value = "所有者类型", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "goodsDevelop", value = "软著开发语言", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "goodsType", value = "软著类型", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "priceRangeStart", value = "价格区间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "priceRangeEnd", value = "价格区间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "priceOrder", value = "DESC或ASC", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX)
public SuccessResultList<List<GoodsSimpleDTO>> listAll(ListPage page) {
Map<String, Object> params = requestParams();
page.setParams(params);
params.put("notUserId", "1");
return goodsonlineService.listPageAll(page);
}
@ApiOperation(value = "上架的商品统计", notes = "上架的商品统计接口")
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("count")

10
src/main/java/cn/com/tenlion/aishop/pojo/dtos/apporder/AppOrderDTO.java
View File

@ -121,6 +121,16 @@ public class AppOrderDTO {
private String userName ;
@ApiModelProperty(name = "userUsername", value = "")
private String userUsername;
@ApiModelProperty(name = "correctionCount", value = "待补正数量")
private Integer waitCorrectionCount;
public Integer getWaitCorrectionCount() {
return waitCorrectionCount == null ? 0 : waitCorrectionCount;
}
public void setWaitCorrectionCount(Integer waitCorrectionCount) {
this.waitCorrectionCount = waitCorrectionCount;
}
public String getAppOrderPayEndTime() {
if(appOrderPayDay != null) {

34
src/main/java/cn/com/tenlion/aishop/service/apporder/impl/AppOrderServiceImpl.java
View File

@ -1,10 +1,13 @@
package cn.com.tenlion.aishop.service.apporder.impl;
import cn.com.tenlion.aishop.pojo.dtos.UserInfoDTO;
import cn.com.tenlion.aishop.pojo.dtos.goods.GoodsSimpleDTO;
import cn.com.tenlion.aishop.pojo.dtos.order.OrderDTO;
import cn.com.tenlion.aishop.pojo.vos.account.PayVO;
import cn.com.tenlion.aishop.pojo.vos.apporder.AppOrderCheckVO;
import cn.com.tenlion.aishop.pojo.vos.apporder.AppOrderSuccessVO;
import cn.com.tenlion.aishop.properties.SystemApiPathProperties;
import cn.com.tenlion.aishop.service.correction.ICorrectionService;
import cn.com.tenlion.aishop.service.remote.IRemoteService;
import cn.com.tenlion.projectconfig.util.ProjectConfigUtil;
import com.alibaba.fastjson.JSON;
@ -177,11 +180,16 @@ public class AppOrderServiceImpl extends DefaultBaseService implements IAppOrder
@Override
public void saveData(String appOrderId, Integer flag, Map<String, Object> params) {
AppOrderDTO app = get(appOrderId);
int appOrderProgress = Integer.valueOf(app.getAppOrderProgress());
if(flag > appOrderProgress) {
params.put("appOrderProgress", flag);
}
params.put("currentAppOrderProgress", flag);
UserInfoBO userInfoBO = this.securityComponent.getCurrentUser();
String currentDate = DateUtil.getTime();
params.put("updateUser", userInfoBO.getUserId());
params.put("updateTime", currentDate);
params.put("appOrderProgress", flag);
params.put("appOrderId", appOrderId);
appOrderDao.update(params);
}
@ -189,15 +197,16 @@ public class AppOrderServiceImpl extends DefaultBaseService implements IAppOrder
@Override
public void updateSubCheck(String appOrderId) {
AppOrderDTO dto = get(appOrderId);
if(!dto.getAppOrderStatus().equals("1")) {
/* if(!dto.getAppOrderStatus().equals("2")) {
throw new SaveException("不允许该操作");
}
}*/
UserInfoBO userInfoBO = this.securityComponent.getCurrentUser();
Map<String, Object> params = getHashMap(2);
String currentDate = DateUtil.getTime();
params.put("updateUser", userInfoBO.getUserId());
params.put("updateTime", currentDate);
params.put("appOrderStatus", "3");
params.put("appOrderId", appOrderId);
params.put("checkStatus", "1");
appOrderDao.update(params);
}
@ -317,6 +326,9 @@ public class AppOrderServiceImpl extends DefaultBaseService implements IAppOrder
@Autowired
private IDataService iDataService;
@Autowired
private ICorrectionService iCorrectionService;
@Override
public List<AppOrderDTO> list(Map<String, Object> params) {
List<AppOrderDTO> list = appOrderDao.list(params);
@ -331,6 +343,22 @@ public class AppOrderServiceImpl extends DefaultBaseService implements IAppOrder
DataDTO subDto = iDataService.get(sub);
dto.setSubClassifyName(subDto.getDataName());
}
if("4,5".contains(dto.getAppOrderStatus())) {
Map<String, Object> query = super.getHashMap(2);
query.put("orderId", dto.getAppOrderId());
Integer count = 0;
query.put("correctionType", "2");
query.put("correctionParentId", "0");
int count1 = iCorrectionService.count(query);
query.put("correctionType", "2");
query.put("createUserId", dto.getCreateUser());
query.put("correctionParentId", null);
query.put("notBuZheng", "notBuZheng");
int count2 = iCorrectionService.count(query);
count = count1 - count2;
dto.setWaitCorrectionCount(count);
}
}
return list;
}

21
src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java
View File

@ -1,9 +1,12 @@
package cn.com.tenlion.aishop.service.correction.impl;
import cn.com.tenlion.aishop.dao.apporder.IAppOrderDao;
import cn.com.tenlion.aishop.pojo.dtos.apporder.AppOrderDTO;
import cn.com.tenlion.aishop.pojo.dtos.goods.GoodsSimpleDTO;
import cn.com.tenlion.aishop.pojo.dtos.goodsonline.GoodsonlineDTO;
import cn.com.tenlion.aishop.pojo.dtos.order.OrderDTO;
import cn.com.tenlion.aishop.pojo.vos.goodslog.GoodslogVO;
import cn.com.tenlion.aishop.service.apporder.IAppOrderService;
import cn.com.tenlion.aishop.service.goodslog.IGoodslogService;
import cn.com.tenlion.aishop.service.goodsonline.IGoodsonlineService;
import cn.com.tenlion.aishop.service.order.IOrderService;
@ -68,7 +71,8 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec
@Autowired
private IGoodsonlineService iGoodsonlineService;
@Autowired
private IAppOrderService iAppOrderService;
@Autowired
private SystemConfig systemConfig;
@ -174,6 +178,7 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec
}
public String saveAppReturnId(String token, CorrectionVO correctionVO) {
AppOrderDTO orderDTO = iAppOrderService.get(correctionVO.getOrderId());
if(StringUtils.isEmpty(correctionVO.getCorrectionRemark()) && StringUtils.isEmpty(correctionVO.getCorrectionFiles())) {
throw new SaveException("资料补充不能为空");
}
@ -199,17 +204,25 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec
}
type = type + "买家";
}
}else{
params.put("correctionType", "2");
}
params.put("createTime", DateUtil.getTime());
params.put("createUserId", params.get("creator").toString());
correctionDao.save(params);
if (systemConfig.getSmsSwitch()) {
if (correctionVO.getCorrectionParentId().equals("0")) {
if(correctionVO.getCorrectionType().contains("1")) {
}
if(correctionVO.getCorrectionType().contains("2")) {
JSONArray phoneArray = new JSONArray();
JSONObject obj = new JSONObject();
obj.put("phone", "18647109157");
phoneArray.add(obj);
Map<String, String> templateParams = new HashMap<>();
templateParams.put("name", orderDTO.getAppName());
TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00015", templateParams, phoneArray);
}
}
}

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

@ -104,7 +104,7 @@ api-path:
user-center: http://192.168.0.115:8091/operator
client-id: 290ec23667434aa289d07ff4e2491c12
client-secret: bStibC84cElYZCtNU2Zhd3dCeUpwMU5NaDZlbXhXTlFmR0pqcDhXMWZBdmxIdG9KZmEyTjJIRnI0dG1McEdEVA==
operator-plugin: http://192.168.0.15:8099/operator-plugin/
operator-plugin: https://www.aimzhu.com/operator-plugin/
#api-path:
# user-center: http://192.168.0.15:8091/operator/

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

@ -83,6 +83,7 @@
<result column="create_user" property="createUser"/>
<result column="update_user" property="updateUser"/>
<result column="delete_status" property="deleteStatus"/>
<result column="user_username" property="userUsername"/>
</resultMap>
<resultMap id="appOrderBO" type="cn.com.tenlion.aishop.pojo.bos.apporder.AppOrderBO">
@ -410,7 +411,9 @@
<if test="checkTime != null and checkTime != ''">
check_time = #{checkTime},
</if>
<if test="currentAppOrderProgress != null and currentAppOrderProgress == 2">
get_file = #{getFile},
</if>
app_order_id = app_order_id
WHERE
app_order_id = #{appOrderId}
@ -466,9 +469,14 @@
t1.create_user,
t1.update_user,
t1.delete_status,
t1.app_order_id
t1.app_order_id,
t2.user_username AS user_username
FROM
operator_app_order t1
LEFT JOIN
user t2
ON
t1.create_user = t2.user_id
WHERE
t1.delete_status = 0
<if test="appOrderId != null and appOrderId != ''">
@ -630,9 +638,14 @@
t1.update_time,
t1.create_user,
t1.update_user,
t1.delete_status
t1.delete_status,
t2.user_username AS user_username
FROM
operator_app_order t1
LEFT JOIN
user t2
ON
t1.create_user = t2.user_id
WHERE
t1.delete_status = '0' AND t1.app_order_pay_status != '1'
<if test="appOrderStatus != null and appOrderStatus != ''">

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

@ -9,6 +9,11 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.search-item .layui-form-select .layui-input {
width: 200px!important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -26,6 +31,14 @@
<div class="layui-inline">
<input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
</div>
<div class="layui-inline layui-form search-item" >
<select id="checkStatus" name="checkStatus">
<option value="">请选择审核状态</option>
<option value="1">审核中</option>
<option value="0">未通过</option>
<option value="2">已通过</option>
</select>
</div>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -93,6 +106,15 @@
return rowData;
}
},
{field: 'userUsername', width: 200, title: '用户账号', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'appName', width: 250, title: '软件名称', align:'center',
templet: function(row) {
var rowData = row[this.field];
@ -120,7 +142,7 @@
return rowData.userUsername + rowData.userName;
}
},*/
{field: 'appOrderProgress', width: 220, title: '当前完成步骤', align:'center',
{field: 'appOrderProgress', width: 220, title: '当前步骤', align:'center',
templet: function(row) {
var rowData = row[this.field];
var appOrderStatus = row['appOrderStatus'];
@ -138,9 +160,9 @@
}else if(appOrderStatus == '3') {
if(checkStatus == '1') {
return '待审核';
}else if(rowData == '2') {
}else if(checkStatus == '2') {
return '审核通过';
}else if(rowData == '0') {
}else if(checkStatus == '0') {
return '审核未通过';
}
}else if(appOrderStatus == '4') {
@ -193,7 +215,8 @@
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
checkStatus: $('#checkStatus').val()
},
page: {
curr: currentPage