czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
SongZhang
2024-08-01 11:22:21 +08:00
parent 38d8c4c817 e617e08923
commit 6c528e3ac6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -459,6 +459,7 @@ public class OrderService {
orderInfo.setStatus("unpaid"); orderInfo.setStatus("unpaid");
orderInfo.setOrderAmount(totalAmount); orderInfo.setOrderAmount(totalAmount);
// orderInfo.setOrderAmount(totalAmount.add(packAMount)); // orderInfo.setOrderAmount(totalAmount.add(packAMount));
orderInfo.setRemark(orderVo.getRemark());
orderInfo.setFreightAmount(feeAmount); orderInfo.setFreightAmount(feeAmount);
orderInfo.setProductAmount(saleAmount); orderInfo.setProductAmount(saleAmount);
orderInfo.setTradeDay(DateUtils.getDay()); orderInfo.setTradeDay(DateUtils.getDay());

3
src/main/resources/mapper/TbOrderInfoMapper.xml
View File

@@ -512,6 +512,9 @@
<if test="masterId != null"> <if test="masterId != null">
master_id = #{masterId,jdbcType=VARCHAR}, master_id = #{masterId,jdbcType=VARCHAR},
</if> </if>
<if test="remark != null and remark!=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>