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-05-22 18:06:12 +08:00
parent 6dd60354a6
commit ef23b61265
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,6 +469,12 @@ public class OrderDetailController extends BaseController {
if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){ if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
addMoneyRemark=financialChangeRecord.getRemark(); addMoneyRemark=financialChangeRecord.getRemark();
} }
OrderAttachmentRecord param1 = new OrderAttachmentRecord();
param1.setFinancialChangeRecordId(financialChangeRecord.getId());
BigDecimal attachmentMoney= BigDecimal.ZERO;
List<OrderAttachmentRecord> orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1);
attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney());
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/java/com/ghy/order/domain/OrderAttachmentRecord.java
View File

@ -42,4 +42,7 @@ public class OrderAttachmentRecord {
*/ */
private String paymentId; private String paymentId;
private Long financialChangeRecordId;
} }

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

@ -11,10 +11,11 @@
<result property="type" column="type" /> <result property="type" column="type" />
<result property="attachMoney" column="attach_money" /> <result property="attachMoney" column="attach_money" />
<result property="paymentId" column="payment_id" /> <result property="paymentId" column="payment_id" />
<result property="financialChangeRecordId" column="financial_change_record_id" />
</resultMap> </resultMap>
<sql id="selectOrderAttachmentRecordVo"> <sql id="selectOrderAttachmentRecordVo">
select id, order_detail_id, order_master_id, type, attach_money,payment_id from order_attachment_record select id, order_detail_id, order_master_id, type, attach_money,payment_id,financial_change_record_id from order_attachment_record
</sql> </sql>
<select id="selectOrderAttachmentRecordList" parameterType="OrderAttachmentRecord" resultMap="OrderAttachmentRecordResult"> <select id="selectOrderAttachmentRecordList" parameterType="OrderAttachmentRecord" resultMap="OrderAttachmentRecordResult">
@ -24,6 +25,7 @@
<if test="orderMasterId != null "> and order_master_id = #{orderMasterId}</if> <if test="orderMasterId != null "> and order_master_id = #{orderMasterId}</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="attachMoney != null "> and attach_money = #{attachMoney}</if> <if test="attachMoney != null "> and attach_money = #{attachMoney}</if>
<if test="financialChangeRecordId != null "> and financial_change_record_id = #{financialChangeRecordId}</if>
</where> </where>
</select> </select>

1
ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java
View File

@ -95,4 +95,5 @@ public class FinancialChangeRecord extends BaseEntity {
private String fileNames; private String fileNames;
private BigDecimal attachmentMoney;
} }