clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-04-22 20:58:01 +08:00
parent 7844f470fa
commit ed1790a79a
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -570,7 +570,7 @@ public class OrderController extends BaseController {
orderMaster.setProvinceName(customerAddress.getProvinceName());
orderMaster.setCityName(customerAddress.getCityName());
orderMaster.setCountryName(customerAddress.getCountryName());
orderMaster.setStreetId(request.getStreetId());
orderMaster.setStreetId(customerAddress.getStreetId());
orderMaster.setStreetName(customerAddress.getStreetName());

4
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -589,6 +589,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
BigDecimal changeMoney = BigDecimal.ZERO;
// 查询子订单的加价记录
List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectByDetailIds(String.valueOf(orderDetailId));
logger.info("子订单加价记录{}",dtx);
if (CollectionUtils.isNotEmpty(financialChangeRecords)) {
// 改价记录只会有一条 直接取出
FinancialChangeRecord fcRecord = financialChangeRecords.get(0);
@ -607,7 +608,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
OrderAttachmentRecord param = new OrderAttachmentRecord();
param.setOrderDetailId(orderDetailId);
List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
logger.info("附件费分账金额{}",dtx1);
logger.info("附件费分账金额{}",orderAttachmentRecordList);
if(CollectionUtils.isNotEmpty(orderAttachmentRecordList)){
// 附件费分账.
attachPaymentConfirm(orderAttachmentRecordList.get(0), orderDetailId, orderDetail.getWorkerId(), deptId);
@ -732,6 +733,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){
masterFee = BigDecimal.ZERO;
}
logger.info("子订单改价分账1级{}2级{}",placeOneMoney,placeTwoMoney);
// 上门师傅的报酬
BigDecimal workerFee = changeMoney;
BigDecimal fineMoney = BigDecimal.ZERO;

6
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -595,12 +595,6 @@
</where>
</select>
<update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
UPDATE order_master
SET timeout_ = #{timeout}
<if test="timeoutFineTimes != null">,timeout_fine_times = #{timeoutFineTimes}</if>
WHERE id = #{id}
</update>
<update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
UPDATE order_master

3
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -617,7 +617,8 @@ public class OrderServiceImpl implements OrderService {
// 查询出"待确认"状态的子订单
List<OrderDetail> orderDetails = orderDetailService.selectByStatus(Collections.singletonList(OrderStatus.FINISH_CHECK.code()));
long now = System.currentTimeMillis();
long day14ago = now - (60 * 60 * 1000L);
//TODO:测试完毕以后改为60分钟
long day14ago = now - (10 * 60 * 1000L);
// long day14ago = now - 10000L;
for (OrderDetail orderDetail : orderDetails) {
// 筛选符合自动确认的订单