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

1

This commit is contained in:
cb 2025-05-22 20:53:55 +08:00
parent ef23b61265
commit 71bb414f23
3 changed files with 10 additions and 2 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

@ -532,8 +532,10 @@ public class OrderController extends BaseController {
Set<Long> goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet()); Set<Long> goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet());
// 所有商品 // 所有商品
List<GoodsStandard> goodsList = goodsStandardService.selectByIds(goodsStandardIds); List<GoodsStandard> goodsList = goodsStandardService.selectByIds(goodsStandardIds);
logger.info("商品信息{}", goodsList);
// 商品所属师傅 // 商品所属师傅
Goods goods = goodsService.selectById(goodsList.get(0).getGoodsId()); Goods goods = goodsService.selectById(goodsList.get(0).getGoodsId());
logger.info("下单后的师傅信息{}", goods);
// 师傅信息 // 师傅信息
Worker worker = workerService.selectById(goods.getWorkerId()); Worker worker = workerService.selectById(goods.getWorkerId());
// 商户ID // 商户ID

3
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -473,9 +473,12 @@ public class OrderDetailController extends BaseController {
param1.setFinancialChangeRecordId(financialChangeRecord.getId()); param1.setFinancialChangeRecordId(financialChangeRecord.getId());
BigDecimal attachmentMoney= BigDecimal.ZERO; BigDecimal attachmentMoney= BigDecimal.ZERO;
List<OrderAttachmentRecord> orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1); List<OrderAttachmentRecord> orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1);
if(orderAttachmentRecords!=null&&orderAttachmentRecords.size()>0){
attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney()); attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney());
financialChangeRecord.setAttachmentMoney(attachmentMoney); financialChangeRecord.setAttachmentMoney(attachmentMoney);
} }
}
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
} }

3
ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml
View File

@ -41,12 +41,14 @@
<if test="orderMasterId != null">order_master_id,</if> <if test="orderMasterId != null">order_master_id,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="attachMoney != null">attach_money,</if> <if test="attachMoney != null">attach_money,</if>
<if test="financialChangeRecordId != null">financial_change_record_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderDetailId != null">#{orderDetailId},</if> <if test="orderDetailId != null">#{orderDetailId},</if>
<if test="orderMasterId != null">#{orderMasterId},</if> <if test="orderMasterId != null">#{orderMasterId},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="attachMoney != null">#{attachMoney},</if> <if test="attachMoney != null">#{attachMoney},</if>
<if test="financialChangeRecordId != null">#{financial_change_record_id},</if>
</trim> </trim>
</insert> </insert>
@ -58,6 +60,7 @@
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="attachMoney != null">attach_money = #{attachMoney},</if> <if test="attachMoney != null">attach_money = #{attachMoney},</if>
<if test="paymentId != null">payment_id = #{paymentId},</if> <if test="paymentId != null">payment_id = #{paymentId},</if>
<if test="financialChangeRecordId != null">financial_change_record_id=#{financialChangeRecordId},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>