Merge remote-tracking branch 'origin/master'

xuhy

2024-09-18 14f62b1e99c93facce4245dbae56b9f43cb0e017

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java

@@ -484,6 +484,7 @@
        TShoppingOrder shoppingOrder = this.baseMapper.selectOne(Wrappers.lambdaQuery(TShoppingOrder.class).eq(TShoppingOrder::getCode, code));
        shoppingOrder.setPaymentStatus(2);
        shoppingOrder.setSerialNumber(outTradeNo);
        shoppingOrder.setPayTime(LocalDateTime.now());
        this.updateById(shoppingOrder);
        //如果是优惠券，赠送优惠券
        if (shoppingOrder.getOrderType()==2){