Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
118361d8
Commit
118361d8
authored
Nov 20, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
8855c6e1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
0 deletions
+35
-0
VehiclePublishGoods.java
...com/xxfc/platform/vehicle/entity/VehiclePublishGoods.java
+5
-0
VehiclePublishGoodsBiz.java
...com/xxfc/platform/vehicle/biz/VehiclePublishGoodsBiz.java
+14
-0
VehiclePublishReceiveBiz.java
...m/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java
+2
-0
VehiclePublishGoodsMapper.java
...fc/platform/vehicle/mapper/VehiclePublishGoodsMapper.java
+11
-0
VehiclePublishMapper.xml
...server/src/main/resources/mapper/VehiclePublishMapper.xml
+3
-0
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehiclePublishGoods.java
View file @
118361d8
...
@@ -45,6 +45,11 @@ public class VehiclePublishGoods implements Serializable {
...
@@ -45,6 +45,11 @@ public class VehiclePublishGoods implements Serializable {
private
Integer
number
;
private
Integer
number
;
@Column
(
name
=
"receive_number"
)
@ApiModelProperty
(
value
=
"已接数量"
)
private
Integer
receiveNumber
;
@Column
(
name
=
"receive_amount"
)
@Column
(
name
=
"receive_amount"
)
@ApiModelProperty
(
value
=
"接单者服务费(单个商品)"
)
@ApiModelProperty
(
value
=
"接单者服务费(单个商品)"
)
private
BigDecimal
receiveAmount
;
private
BigDecimal
receiveAmount
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishGoodsBiz.java
View file @
118361d8
...
@@ -64,6 +64,20 @@ public class VehiclePublishGoodsBiz extends BaseBiz<VehiclePublishGoodsMapper, V
...
@@ -64,6 +64,20 @@ public class VehiclePublishGoodsBiz extends BaseBiz<VehiclePublishGoodsMapper, V
}
}
public
List
<
VehiclePublishGoods
>
getListByPublishId
(
Integer
publishId
){
return
mapper
.
groupGoodsIdList
(
publishId
);
}
public
void
updReceiveNumber
(
Integer
publishId
){
List
<
VehiclePublishGoods
>
list
=
getListByPublishId
(
publishId
);
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
for
(
VehiclePublishGoods
publishGoods
:
list
){
updateSelectiveById
(
publishGoods
);
}
}
}
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java
View file @
118361d8
...
@@ -214,11 +214,13 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
...
@@ -214,11 +214,13 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
addVehicleUseTime
(
publishReceiveDTO
);
addVehicleUseTime
(
publishReceiveDTO
);
VehicleReceiveRefundDTO
receiveRefundDTO
=
new
VehicleReceiveRefundDTO
();
VehicleReceiveRefundDTO
receiveRefundDTO
=
new
VehicleReceiveRefundDTO
();
receiveRefundDTO
.
setOrderNoStr
(
orderNoStr
);
receiveRefundDTO
.
setOrderNoStr
(
orderNoStr
);
publishGoodsBiz
.
updReceiveNumber
(
publishId
);
sendQueue
(
receiveRefundDTO
);
sendQueue
(
receiveRefundDTO
);
}
else
if
(
type
==
1
){
}
else
if
(
type
==
1
){
if
(
status
.
equals
(
VehiclePublishReceiveDTO
.
PAY
)){
if
(
status
.
equals
(
VehiclePublishReceiveDTO
.
PAY
)){
vehiclePublishBiz
.
updWaitConfirmNumber
(
number
,
publishId
);
vehiclePublishBiz
.
updWaitConfirmNumber
(
number
,
publishId
);
addVehicleUseTime
(
publishReceiveDTO
);
addVehicleUseTime
(
publishReceiveDTO
);
publishGoodsBiz
.
updReceiveNumber
(
publishId
);
}
}
}
}
}
}
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehiclePublishGoodsMapper.java
View file @
118361d8
...
@@ -4,6 +4,8 @@ package com.xxfc.platform.vehicle.mapper;
...
@@ -4,6 +4,8 @@ package com.xxfc.platform.vehicle.mapper;
import
com.xxfc.platform.vehicle.entity.VehiclePublishGoods
;
import
com.xxfc.platform.vehicle.entity.VehiclePublishGoods
;
import
com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO
;
import
com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO
;
import
com.xxfc.platform.vehicle.pojo.vo.VehiclePublishGoodsVo
;
import
com.xxfc.platform.vehicle.pojo.vo.VehiclePublishGoodsVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
tk.mybatis.mapper.additional.idlist.SelectByIdListMapper
;
import
tk.mybatis.mapper.additional.idlist.SelectByIdListMapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
...
@@ -17,4 +19,13 @@ public interface VehiclePublishGoodsMapper extends Mapper<VehiclePublishGoods>,
...
@@ -17,4 +19,13 @@ public interface VehiclePublishGoodsMapper extends Mapper<VehiclePublishGoods>,
List
<
VehiclePublishGoodsVo
>
selectListByOrderNo
(
VehiclePublishFindDTO
publishFindDTO
);
List
<
VehiclePublishGoodsVo
>
selectListByOrderNo
(
VehiclePublishFindDTO
publishFindDTO
);
@Select
(
"SELECT r.publish_goods_id as id,IFNULL(COUNT(r.id)) as receiveNumber FROM vehicle_publish_receive r \n"
+
"\n"
+
"LEFT JOIN vehicle_publish_goods g ON r.publish_goods_id = g.id\n"
+
"\n"
+
"WHERE g.publish_id=#{publishId} and r.`status` in (1,3) and r.is_del = 0\n"
+
"\n"
+
"GROUP BY r.publish_goods_id"
)
List
<
VehiclePublishGoods
>
groupGoodsIdList
(
@Param
(
"publishId"
)
Integer
publishId
);
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishMapper.xml
View file @
118361d8
...
@@ -14,6 +14,9 @@
...
@@ -14,6 +14,9 @@
<if
test=
"companyId != null and companyId > 0"
>
<if
test=
"companyId != null and companyId > 0"
>
AND p.`company_id`= #{companyId}
AND p.`company_id`= #{companyId}
</if>
</if>
<if
test=
"publishId != null and publishId > 0"
>
AND p.`id`= #{publishId}
</if>
<if
test=
"goodsType != null "
>
<if
test=
"goodsType != null "
>
AND p.`goods_type`= #{goodsType}
AND p.`goods_type`= #{goodsType}
</if>
</if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment