Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-02 cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41

 src/main/java/com/mzl/flower/service/payment/OrderService.java

@@ -43,6 +43,7 @@
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.menber.MemberGrowthRecordService;
import com.mzl.flower.service.point.CustomerPointService;
import com.mzl.flower.service.point.PointGoodsService;
import com.mzl.flower.service.system.CodeService;
import com.mzl.flower.service.system.WeChatService;
import com.mzl.flower.service.transport.TransportService;
@@ -146,6 +147,9 @@

    @Autowired
    private CustomerPointService customerPointService;

    @Autowired
    private PointGoodsService pointGoodsService;

    public void changeFlower2Cart(CartSaveDTO dto) {
        String userId = SecurityUtils.getUserId();
@@ -503,7 +507,12 @@
    }

    private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
        //TODO 使用积分商品兑换券
        //使用积分商品兑换券
        if(goodsRecordIdList != null && goodsRecordIdList.size() > 0){
            for(Long grId : goodsRecordIdList){
                pointGoodsService.useExchangeGoods(grId, orderId);
            }
        }
    }

    /**