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

puzhibing

2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java

@@ -1016,10 +1016,10 @@
            }
        }

        if(appUser.getHavDiscount() == 1){//9折
            order.setDiscount(9D);
            order.setDiscountAmount(payMoney * 0.1);
            payMoney = payMoney * 0.9;
        if(appUser.getHavDiscount() == 1){//9.5折
            order.setDiscount(9.5D);
            order.setDiscountAmount(payMoney * 0.05);
            payMoney = payMoney * 0.95;
        }

        order.setPayType(2);